Adding debian version 3.0~a1-1.

3 files changed, 12 insertions, 39 deletions

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 31e1e72..ba4a7a3 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -66,15 +66,7 @@ then
 			continue
 		fi
 
-		# udev (>= 146) no longer provides vol_id
-		if [ -x /lib/udev/vol_id ]
-		then
-			# lenny
-			/lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
-		else
-			# squeeze
-			/sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
-		fi
+		/sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
 
 		magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
 
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
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 4ed1c6d..ef83c72 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -66,17 +66,6 @@ remove_applet ()
 	chroot /root update-gconf-defaults
 }
 
-add_sudoers_file ()
-{
-
-cat <<EOF > /root/etc/sudoers.d/a11y-sudo
-# TO allow accessibility in GTK to work with sudo.
-Defaults        env_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"
-EOF
-
-	chmod 0440 /root/etc/sudoers.d/a11y-sudo
-}
-
 case ${ACCESS} in
 	access=v1)
 		# Lesser Visual Impairment
@@ -101,7 +90,7 @@ case ${ACCESS} in
 		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-		add_sudoers_file
+		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		if [ -x /root/usr/bin/orca ]
 		then
@@ -123,7 +112,7 @@ case ${ACCESS} in
 		gct -s -t string /apps/empathy/conversation/theme classic
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-		add_sudoers_file
+		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		remove_applet fast_user_switch
 		if [ -x /root/usr/bin/orca ]
@@ -141,7 +130,7 @@ case ${ACCESS} in
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 		gct -s -t string /apps/empathy/conversation/theme classic
-		add_sudoers_file
+		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		if [ -x /root/usr/bin/orca ]
 		then