Author: aschnell Date: Thu Nov 3 12:18:52 2011 New Revision: 66673 URL: http://svn.opensuse.org/viewcvs/yast?rev=66673&view=rev Log: - use same code to display ip addresses during vnc and ssh installation (bnc#727802) Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/startup/YaST2.call branches/SuSE-Code-11-SP2-Branch/installation/startup/common/network.sh branches/SuSE-Code-11-SP2-Branch/installation/startup/common/vnc.sh Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/VERSION?rev=66673&r1=66672&r2=66673&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Thu Nov 3 12:18:52 2011 @@ -1 +1 @@ -2.17.94 +2.17.95 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes?rev=66673&r1=66672&r2=66673&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Thu Nov 3 12:18:52 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 03 11:52:08 CET 2011 - aschnell@suse.de + +- use same code to display ip addresses during vnc and ssh + installation (bnc#727802) +- 2.17.95 + +------------------------------------------------------------------- Fri Oct 7 11:31:04 UTC 2011 - jsrain@suse.cz - change the URL for congratulation dialog (bnc#720481) Modified: branches/SuSE-Code-11-SP2-Branch/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/startup/YaST2.call?rev=66673&r1=66672&r2=66673&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/startup/YaST2.call (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/startup/YaST2.call Thu Nov 3 12:18:52 2011 @@ -622,6 +622,7 @@ # 1) Source common script functions #--------------------------------------------- . /usr/lib/YaST2/startup/common/functions.sh +. /usr/lib/YaST2/startup/common/network.sh . /usr/lib/YaST2/startup/requires . /usr/lib/YaST2/startup/arch/ia64/x11.sh . /usr/lib/YaST2/startup/arch/i386/x11.sh Modified: branches/SuSE-Code-11-SP2-Branch/installation/startup/common/network.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/startup/common/network.sh?rev=66673&r1=66672&r2=66673&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/startup/common/network.sh (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/startup/common/network.sh Thu Nov 3 12:18:52 2011 @@ -41,6 +41,13 @@ return 1 } + +function list_ifaces() +{ + /sbin/ifconfig | grep -A1 "^[a-z]" +} + + #----[ vnc_message ]-----# function vnc_message () { #-------------------------------------------------- @@ -70,7 +77,6 @@ active interfaces: EOF - /sbin/ifconfig | grep -A1 "^[a-z]" + list_ifaces echo } - Modified: branches/SuSE-Code-11-SP2-Branch/installation/startup/common/vnc.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/startup/common/vnc.sh?rev=66673&r1=66672&r2=66673&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/startup/common/vnc.sh (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/startup/common/vnc.sh Thu Nov 3 12:18:52 2011 @@ -44,38 +44,27 @@ # start Xvnc server and write a log file from the # VNC server process # - # .../ # The IP set in install.inf may not be valid if the DHCP server # gave us a different lease in the meantime (#43974). - # sed: don't print; if it's localhost, skip; try locating IPv4; - # skip if not found; otherwise print and exit - # ---- - IP=`ip addr list | sed -n \ - -e '/127.0.0.[[:digit:]]/b;s/^[[:space:]]*inet[[:space:]]\([^/]*\).*/\1/;T;p;q'` echo echo starting VNC server... echo A log file will be written to: /var/log/YaST2/vncserver.log ... cat <<-EOF - + *** - *** You can connect to $IP, display :1 now with vncviewer - *** Or use a Java capable browser on http://$IP:5801/ + *** You can connect to <host>, display :1 now with vncviewer + *** Or use a Java capable browser on http://<host>:5801/ *** - + (When YaST2 is finished, close your VNC viewer and return to this window.) - + + Active interfaces: + EOF - #========================================== - # Fake hostname to make VNC screen pretty - #------------------------------------------ - if [ "$(hostname)" = "(none)" ] ; then - hostname $IP - fi - #========================================== - # store hostname for use in desktop option - #------------------------------------------ - VNC_HOSTNAME=`hostname` + list_ifaces + echo + #========================================== # Start Xvnc... # For -noreset see BNC #351338 @@ -83,7 +72,7 @@ $Xbindir/Xvnc $Xvncparam :0 \ -noreset \ -rfbauth /root/.vnc/passwd.yast \ - -desktop "Installation at: $VNC_HOSTNAME" \ + -desktop "Installation" \ -geometry 800x600 \ -depth 16 \ -rfbwait 120000 \ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org