Adding upstream version 1.154.5.

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index 4c0fe80..9295070 100755 (executable)
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -58,7 +58,7 @@ set passwd/username
 set passwd/user-uid
 EOF
 
-if ! grep "${USERNAME}" /root/etc/passwd
+if ! grep -qs "${USERNAME}" /root/etc/passwd
 then
        echo "The default user (${USERNAME}) is not present,"
        first_user=$(grep '^[^:]*:[^:]*:[12]\?[0-9][0-9][0-9][0-9]:' /root/etc/passwd | head -1 | cut -f1 -d ':')

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 947b7ec..f6a3f8d 100755 (executable)
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -82,7 +82,7 @@ ${setmodel}
 ${setoptions}
 EOF
 
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg 2>&1 \
+live-reconfigure /root xserver-xorg 2>&1 \
        | grep -v "overwriting possibly-customised configuration" \
        | grep -v "file; backup in /etc/X11/xorg.conf"
 umount /root/sys

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 6a66996..72aaf12 100755 (executable)
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -90,7 +90,7 @@ else
        fi
 
        # iterate the physical interfaces and add them to the interfaces list
-       if [ "${method}" != dhcp ] || [ ! -x /root/usr/sbin/NetworkManager ]
+       if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ])
        then
                for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
                do

diff --git a/scripts/live-helpers b/scripts/live-helpers
index f6b8b8b..adb56b7 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -77,7 +77,7 @@ get_fstype ()
            return
        fi
 
-       eval $(fstype < ${1} 2>/dev/null)
+       eval $(fstype ${1} 2>/dev/null)
 
        if [ "${FSTYPE}" != "unknown" ]
        then