diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-08-10 01:57:53 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:58:08 +0100 |
| commit | 52dcef518bdb95605670b8dc12257057bf7a2dc0 (patch) | |
| tree | 638f1c1ebb55ebcc0363eca6076bc7c379e568cf /scripts/live-bottom/23networking | |
| parent | 432f4b1dfead12040d21d15fd2f3ecc033ac5ca3 (diff) | |
| download | live-boot-52dcef518bdb95605670b8dc12257057bf7a2dc0.tar.gz live-boot-52dcef518bdb95605670b8dc12257057bf7a2dc0.zip | |
Adding debian version 3.0~a1-1.
Diffstat (limited to 'scripts/live-bottom/23networking')
| -rwxr-xr-x | scripts/live-bottom/23networking | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking index 9554b77..871d8c0 100755 --- a/scripts/live-bottom/23networking +++ b/scripts/live-bottom/23networking @@ -51,32 +51,24 @@ udevadm settle if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ] then - parsed=$(echo "${STATICIP}" | sed -e 's/,/ /g') + parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g') for ifline in ${parsed} do - ifname="$(echo ${ifline} | cut -f1 -d ':')" - ifaddress="$(echo ${ifline} | cut -f2 -d ':')" - ifnetmask="$(echo ${ifline} | cut -f3 -d ':')" - ifgateway="$(echo ${ifline} | cut -f4 -d ':')" + ifname="$(echo ${ifline} | cut -f1 -d ',')" + ifaddress="$(echo ${ifline} | cut -f2 -d ',')" + ifnetmask="$(echo ${ifline} | cut -f3 -d ',')" + ifgateway="$(echo ${ifline} | cut -f4 -d ',')" cat >> "${IFFILE}" << EOF -allow-hotplug ${ifname} +auto ${ifname} iface ${ifname} inet static address ${ifaddress} netmask ${ifnetmask} -EOF - -if [ -n "${ifgateway}" ] -then - -cat >> "${IFFILE}" << EOF gateway ${ifgateway} EOF -fi - done else if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ] @@ -98,7 +90,7 @@ else i="$(basename ${interface})" cat >> "${IFFILE}" << EOF -allow-hotplug ${i} +auto ${i} iface ${i} inet ${method} EOF @@ -146,7 +138,7 @@ fi # grep -q "iface ${i}" ${IFFILE} && continue # #cat >> "${IFFILE}" << EOF -#allow-hotplug ${i} +#auto ${i} #iface ${i} inet dhcp # #EOF |