Author: aschnell Date: Mon Nov 3 16:26:38 2008 New Revision: 52839 URL: http://svn.opensuse.org/viewcvs/yast?rev=52839&view=rev Log: - improved ssh reboot message a bit Modified: trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=52839&r1=52838&r2=52839&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Nov 3 16:26:38 2008 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Mon Nov 03 14:28:14 CET 2008 - aschnell@suse.de -- better reboot message during ssh installation (bnc #439572) +- better reboot message during ssh installation (bnc #439572 and + bnc #432005) - 2.17.25 ------------------------------------------------------------------- Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?rev=52839&r1=52838&r2=52839&view=diff ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Mon Nov 3 16:26:38 2008 @@ -479,15 +479,20 @@ function ssh_reboot_message() { - echo "*** Preparing SSH installation for reboot ***" + # SecondStageRequired can be set: + # 1. after 1st stage (note 2nd stage is not always required) + # 2. after 2nd stage (when another YaST run is required due to e.g. + # kernel update) if [ -f /etc/install.inf ] ; then SecondStageRequired=$(awk ' /^SecondStageRequired:/ { print $2 }' < /etc/install.inf) fi if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "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 ***" + log "\tPreparing SSH installation for reboot" fi } @@ -565,7 +570,6 @@ fi if [ $SELECTED_MEDIUM = "SSH" ] && [ ! "$VNC" = 1 ];then ssh_reboot_message - log "\tPreparing SSH installation for reboot" echo $Y2_EXIT_CODE > /tmp/YaST2_ssh_installation_finished fi if [ $Y2_EXIT_CODE -eq 0 ];then -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org