Author: mzugec Date: Mon May 28 10:16:01 2007 New Revision: 38153 URL: http://svn.opensuse.org/viewcvs/yast?rev=38153&view=rev Log: installation network changes: http://lists.opensuse.org/yast-devel/2007-05/msg00025.html Modified: trunk/installation/VERSION trunk/installation/control/control.openSUSE.xml trunk/installation/control/control.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/network_finish.ycp trunk/installation/startup/Second-Stage/S07-medium Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=38153&r1=38152&r2=38153&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon May 28 10:16:01 2007 @@ -1 +1 @@ -2.15.26 +2.15.27 Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=38153&r1=38152&r2=38153&view=diff ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon May 28 10:16:01 2007 @@ -512,12 +512,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - no - no - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> no no @@ -596,12 +590,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - no - no - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> no no @@ -754,10 +742,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/control.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.xml?rev=38153&r1=38152&r2=38153&view=diff ============================================================================== --- trunk/installation/control/control.xml (original) +++ trunk/installation/control/control.xml Mon May 28 10:16:01 2007 @@ -501,10 +501,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -573,10 +569,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> @@ -732,10 +724,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=38153&r1=38152&r2=38153&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon May 28 10:16:01 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sun May 27 14:49:37 CEST 2007 - mzugec@suse.de + +- installation network changes: +http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.27 + +------------------------------------------------------------------- Tue May 22 10:51:57 CEST 2007 - ug@suse.de - reactivate hardware detection during autoinstall Modified: trunk/installation/src/clients/network_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/network_finish.ycp?rev=38153&r1=38152&r2=38153&view=diff ============================================================================== --- trunk/installation/src/clients/network_finish.ycp (original) +++ trunk/installation/src/clients/network_finish.ycp Mon May 28 10:16:01 2007 @@ -48,19 +48,18 @@ } else if (func == "Write") { - if (Linuxrc::display_ip () || Linuxrc::vnc () || Linuxrc::usessh ()) + + // if network running, write network configuration + map output = (map)SCR::Execute(.target.bash_output, + "([ $(ip addr|grep -v '127.0.0.1'|grep -c inet) != '0' ] && echo 'network') || echo 'no net'"); + if (issubstring(output["stdout"]:"", "network")) { - y2milestone("Creating network interface"); - WFM::Execute (.local.bash, - "/sbin/create_interface '" + String::Quote (Installation::destdir) + "'"); + y2milestone("Save network configuration"); + WFM::CallFunction ("save_network"); ModulesConf::RunDepmod (false); + + } - // -------------------------------------------------------------- - // Copy DHCP client cache so that we can request the same IP (#43974). - WFM::Execute (.local.bash, sformat ( - "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", - "/var/lib/dhcpcd", - String::Quote (Installation::destdir))); } else { Modified: trunk/installation/startup/Second-Stage/S07-medium URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/Second-Stage/S07-medium?rev=38153&r1=38152&r2=38153&view=diff ============================================================================== --- trunk/installation/startup/Second-Stage/S07-medium (original) +++ trunk/installation/startup/Second-Stage/S07-medium Mon May 28 10:16:01 2007 @@ -1,5 +1,5 @@ #!/bin/sh -log "Starting S08-medium..." +log "Starting S07-medium..." log "======================" #============================================= @@ -7,43 +7,36 @@ #--------------------------------------------- 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 #--------------------------------------------- if ! got_install_param '^NoShell:.*1' ; then - log "\tGot kernel parameter <NoShell> -> start shell on tty2" - SPID=`/usr/lib/YaST2/bin/startshell /dev/tty2` + log "\tGot kernel parameter <NoShell> -> start shell on tty2" + SPID=`/usr/lib/YaST2/bin/startshell /dev/tty2` fi + #============================================= -# 11.2) prepare for VNC installation +# 11.1) activate network if counfiguration found #--------------------------------------------- -if got_install_param '^VNC:.*1' ; then - log "\tGot kernel parameter VNC -> export VNC variable" - export VNC=1 +if [ ! -z $(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo') ] ;then + log "\tnetwork configuration found -> activate network" + rcnetwork start && Y2_NETWORK_ACTIVE=1 + +# 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 + fi -#============================================= -# 11.3) prepare for SSH installation -#--------------------------------------------- if got_install_param '^UseSSH:.*1' ; then log "\tGot kernel parameter UseSSH -> export UseSSH variable" - export USE_SSH=1 -fi -#============================================= -# 11.4) activate network for SSH, VNC, or remote X11 inst. -#--------------------------------------------- -if [ $VNC -eq 1 ] || [ $USE_SSH -eq 1 ] || [ -n "$Display_IP" ] ;then - log "\tVNC/SSH/remote X11 installation used -> activate network" - rcnetwork start && Y2_NETWORK_ACTIVE=1 - rcSuSEfirewall2 reload -fi -if [ $USE_SSH -eq 1 ];then rcsshd start && Y2_SSH_ACTIVE=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