Merge branche make

[hvlinux.git] / stage2 / install-bootscripts

diff --git a/stage2/install-bootscripts b/stage2/install-bootscripts
index 50717e6..894c344 100755 (executable)
--- a/stage2/install-bootscripts
+++ b/stage2/install-bootscripts
@@ -1,10 +1,9 @@
 #!/bin/bash
-set -o errexit
 
 # Reading system configuration informations, functions and package versions.
-source ../sysinfos
+source ../config/sysinfos
 source ../functions
-source ../packages-list
+source ../config/packages-list
 
 DHCP_USED="no"
 
@@ -24,9 +23,9 @@ for nic_device in ${INTERFACES}; do
     echo "IPADDR=\"${IP_ADDRESS[${LOOP_INDEX}]}\"" >> ${file}
     echo "PREFIX_LENGTH=\"${PREFIX_LENGTH[${LOOP_INDEX}]}\"" >> ${file}
     echo "IFSCOPE=\"\"" >> ${file}
+    echo "GATEWAY=\"${GATEWAY[${LOOP_INDEX}]}\"" >> ${file}
 
     if [ "x${BOOTPROTO[${LOOP_INDEX}]}" = "xdhcp" ]; then
-       GATEWAY=""
        DHCP_USED="yes"
     fi
 
@@ -50,7 +49,6 @@ echo "#!/bin/sh" > /etc/sysconfig/network/network-parameters
 echo "DOMAINNAME=\"${DOMAIN}\"" >> /etc/sysconfig/network/network-parameters
 echo "INTERFACES_UP=\"lo ${INTERFACES}\"" >> /etc/sysconfig/network/network-parameters
 echo "INTERFACES_DN=\"${INTERFACES} lo\"" >> /etc/sysconfig/network/network-parameters
-echo "GATEWAY=\"${GATEWAY}\"" >> /etc/sysconfig/network/network-parameters
 
 cat >> /etc/sysconfig/network/network-parameters << EOF