Author: mzugec Date: Thu Jul 26 17:56:34 2007 New Revision: 39725 URL: http://svn.opensuse.org/viewcvs/yast?rev=39725&view=rev Log: set variables VNC and USE_SSH in S07-medium (#294485) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/Second-Stage/S07-medium Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=39725&r1=39724&r2=39725&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Jul 26 17:56:34 2007 @@ -1 +1 @@ -2.15.35 +2.15.36 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=39725&r1=39724&r2=39725&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jul 26 17:56:34 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 26 17:51:29 CEST 2007 - mzugec@suse.cz + +- set variables VNC and USE_SSH in S07-medium (#294485) +- 2.15.36 + +------------------------------------------------------------------- Wed Jul 25 12:48:50 CEST 2007 - mvidner@suse.cz - startup scripts: Call initviocons only if it exists (#173426). Modified: trunk/installation/startup/Second-Stage/S07-medium URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/Second-Stage/S07-medium?rev=39725&r1=39724&r2=39725&view=diff ============================================================================== --- trunk/installation/startup/Second-Stage/S07-medium (original) +++ trunk/installation/startup/Second-Stage/S07-medium Thu Jul 26 17:56:34 2007 @@ -7,6 +7,9 @@ #--------------------------------------------- Y2_NETWORK_ACTIVE=0 Y2_SSH_ACTIVE=0 +USE_SSH=0 +VNC=0 + log "\tChecking kernel commandline..." #============================================= # 11.1 start shell on second virtual console @@ -22,21 +25,24 @@ if [ ! -z "$(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo')" ]; then log "\tnetwork configuration found -> activate network" rcnetwork start && Y2_NETWORK_ACTIVE=1 + [ -f /var/lib/YaST2/network_install_portmap ] && rcportmap start +fi -# firewall is started by rcnetwork -# rcSuSEfirewall2 reload - - -# if nfs:// is used for install source or add-on (reminder /var/lib/YaST2/network_install_portmap), -# start rcportmap - -[ -f /var/lib/YaST2/network_install_portmap ] && rcportmap start - +#============================================= +# 11.2) prepare for VNC installation +#--------------------------------------------- +if got_install_param '^VNC:.*1' ; then + log "\tGot kernel parameter VNC -> export VNC variable" + export VNC=1 fi + if got_install_param '^UseSSH:.*1' ; then log "\tGot kernel parameter UseSSH -> export UseSSH variable" rcsshd start && Y2_SSH_ACTIVE=1 + export USE_SSH=1 fi log "\tSummary for commandline checks:" log "\tY2_NETWORK_ACTIVE = $Y2_NETWORK_ACTIVE" log "\tY2_SSH_ACTIVE = $Y2_SSH_ACTIVE" +log "\tUSE_SSH = $USE_SSH" +log "\tVNC = $VNC" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org