Author: aschnell Date: Fri Jan 22 15:57:59 2010 New Revision: 60499 URL: http://svn.opensuse.org/viewcvs/yast?rev=60499&view=rev Log: - fixed message during ssh installation (bnc #518616) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.ssh Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=60499&r1=60498&r2=60499&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jan 22 15:57:59 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jan 22 15:56:07 CET 2010 - aschnell@suse.de + +- fixed message during ssh installation (bnc #518616) + +------------------------------------------------------------------- Fri Jan 15 17:29:45 CET 2010 - aschnell@suse.de - updated control.rnc Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?rev=60499&r1=60498&r2=60499&view=diff ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Fri Jan 22 15:57:59 2010 @@ -62,11 +62,15 @@ # running the second stage installation /usr/lib/YaST2/startup/YaST2.call installation continue - # second stage installation needs to reboot - if [ -f /var/lib/YaST2/reboot ]; then + if [ -f /etc/install.inf ] ; then + SecondStageRequired=$(awk ' /^SecondStageRequired:/ { print $2 }' < /etc/install.inf) + fi + + if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "1" ] ; then + # second stage installation needs to reboot reboot_during_second_stage - # second stage has just finished else + # second stage has just finished continue_after_second_stage fi else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org