Author: aschnell Date: Mon Nov 3 14:29:38 2008 New Revision: 52829 URL: http://svn.opensuse.org/viewcvs/yast?rev=52829&view=rev Log: - better reboot message during ssh installation (bnc #439572) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call trunk/installation/startup/YaST2.ssh Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=52829&r1=52828&r2=52829&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Nov 3 14:29:38 2008 @@ -1 +1 @@ -2.17.24 +2.17.25 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=52829&r1=52828&r2=52829&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Nov 3 14:29:38 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 03 14:28:14 CET 2008 - aschnell@suse.de + +- better reboot message during ssh installation (bnc #439572) +- 2.17.25 + +------------------------------------------------------------------- Fri Oct 31 16:28:23 CET 2008 - locilka@suse.cz - Fixed checking whether running the second stage is required. Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?rev=52829&r1=52828&r2=52829&view=diff ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Mon Nov 3 14:29:38 2008 @@ -476,6 +476,22 @@ fi } + +function ssh_reboot_message() +{ + echo "*** Preparing SSH installation for reboot ***" + + if [ -f /etc/install.inf ] ; then + SecondStageRequired=$(awk ' /^SecondStageRequired:/ { print $2 }' < /etc/install.inf) + fi + + if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "1" ] ; then + echo "*** NOTE: after reboot, you have to reconnect and call ***" + echo "*** /usr/lib/YaST2/startup/YaST2.ssh ***" + fi +} + + #----[ start_yast ]----# function start_yast () { #------------------------------------------------------ @@ -548,9 +564,7 @@ log "\t$Y2_OK_MESSAGE" fi if [ $SELECTED_MEDIUM = "SSH" ] && [ ! "$VNC" = 1 ];then - echo "*** Preparing SSH installation for reboot ***" - echo "*** NOTE: after reboot, you have to reconnect and call ***" - echo "*** /usr/lib/YaST2/startup/YaST2.ssh ***" + ssh_reboot_message log "\tPreparing SSH installation for reboot" echo $Y2_EXIT_CODE > /tmp/YaST2_ssh_installation_finished fi Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?rev=52829&r1=52828&r2=52829&view=diff ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Mon Nov 3 14:29:38 2008 @@ -37,7 +37,7 @@ cat <<-EOF Your system has been updated and needs to reboot ... - + Reconnect to the system after it reboots and call /usr/lib/YaST2/startup/YaST2.ssh again to continue the installation ... @@ -49,7 +49,7 @@ cat <<-EOF File /var/lib/YaST2/runme_at_boot does not exist ... - + Not running YaST ... EOF -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org