[SCM] live-boot branch, debian-next, updated. debian/3.0_a2-1-1-gf38c81a
Daniel Baumann
daniel at debian.org
Thu Sep 2 08:43:06 UTC 2010
The following commit has been merged in the debian-next branch:
commit f38c81af7bbda76688ae2ef363c2eb6036374e93
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 2 10:40:33 2010 +0200
Updating seperators in networking bottom script to fix ip parameter parsing (Closes: #590494).
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index f023729..8c856c6 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -51,14 +51,14 @@ 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}
--
live-boot
More information about the debian-live-changes
mailing list