Adding upstream version 3.0~a5.

diff --git a/Makefile b/Makefile
index d38a949..6f69012 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -78,14 +78,26 @@ install:
 uninstall:
        # Uninstalling executables
        rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin
+
        rm -rf $(DESTDIR)/usr/share/live-boot
+
        rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
        rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*
        rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
 
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+
        # Uninstalling docs
        rm -rf $(DESTDIR)/usr/share/doc/live-boot
-       # (FIXME)
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
 
        # Uninstalling manpages
        for MANPAGE in manpages/en/*; \
@@ -103,8 +115,22 @@ uninstall:
                done; \
        done
 
+       for SECTION in $(ls manpages/en/* | awk -F. '{ print $2 }'); \
+       do \
+               rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} || true; \
+               rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/*/man$${SECTION} || true; \
+       done
+
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
+
+       rmdir --ignore-fail-on-non-empty $(DESTDIR) || true
+
 clean:
+       @echo "Nothing to clean."
 
-distclean:
+distclean: clean
+       @echo "Nothing to distclean."
 
 reinstall: uninstall install

diff --git a/VERSION b/VERSION
index d436840..97c929b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a4
+3.0~a5

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index c4ac50a..f533597 100644 (file)
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 02.09.2010 3.0~a4 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 06.09.2010 3.0~a5 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte

diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index eb52933..b067e09 100644 (file)
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 1 02.09.2010 3.0~a4 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 06.09.2010 3.0~a5 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index f2cd174..f424f25 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-09\-02 3.0~a4 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-09\-06 3.0~a5 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts

diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 47dff38..d2c82cc 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-09\-02 3.0~a4 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-09\-06 3.0~a5 "Debian Live Project"
 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 44e617d..a305617 100644 (file)
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~a4\n"
-"POT-Creation-Date: 2010-09-02 22:46+0300\n"
+"Project-Id-Version: live-boot 3.0~a5\n"
+"POT-Creation-Date: 2010-09-06 15:17+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-09-02"
-msgstr "02.09.2010"
+msgid "2010-09-06"
+msgstr "06.09.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a4"
-msgstr "3.0~a4"
+msgid "3.0~a5"
+msgstr "3.0~a5"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1

diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index fe1f7ee..c1108be 100644 (file)
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~a4\n"
-"POT-Creation-Date: 2010-09-02 22:46+0300\n"
+"Project-Id-Version: live-boot 3.0~a5\n"
+"POT-Creation-Date: 2010-09-06 15:17+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-09-02"
-msgstr "02.09.2010"
+msgid "2010-09-06"
+msgstr "06.09.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a4"
-msgstr "3.0~a4"
+msgid "3.0~a5"
+msgstr "3.0~a5"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 47200a8..e6b4c14 100644 (file)
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-09-02 22:46+0300\n"
+"POT-Creation-Date: 2010-09-06 15:17+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-09-02"
+msgid "2010-09-06"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a4"
+msgid "3.0~a5"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index eb3b076..e8b6d2a 100644 (file)
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-09-02 22:46+0300\n"
+"POT-Creation-Date: 2010-09-06 15:17+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-09-02"
+msgid "2010-09-06"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a4"
+msgid "3.0~a5"
 msgstr ""
 
 #. type: TH

diff --git a/scripts/live b/scripts/live
index 0e9b0aa..d34279d 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -466,7 +466,7 @@ is_nice_device ()
 {
        sysfs_path="${1#/sys}"
 
-       if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+       if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
        then
                return 0
        elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -1687,16 +1687,6 @@ find_livefs ()
        return 1
 }
 
-set_usplash_timeout ()
-{
-       if [ -x /sbin/usplash_write ]
-       then
-               /sbin/usplash_write "TIMEOUT 120"
-       else if [ -x /sbin/splashy_update ] ; then
-               /sbin/splashy_update "TIMEOUT 120"
-       fi ; fi
-}
-
 integrity_check ()
 {
        media_mountpoint="${1}"
@@ -1723,14 +1713,6 @@ integrity_check ()
        fi
 }
 
-start_usplash_pulse ()
-{
-       if [ -x /sbin/usplash_write ]
-       then
-               /sbin/usplash_write "PULSELOGO"
-       fi
-}
-
 mountroot ()
 {
         if [ -x /scripts/local-top/cryptroot ]; then
@@ -1749,9 +1731,6 @@ mountroot ()
 
        Arguments
 
-       set_usplash_timeout
-       start_usplash_pulse
-
        maybe_break live-premount
        log_begin_msg "Running /scripts/live-premount"
        run_scripts /scripts/live-premount
@@ -1760,8 +1739,6 @@ mountroot ()
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout
 
-       set_usplash_timeout
-
        if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
        then
                if do_netmount

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 8c856c6..9554b77 100755 (executable)
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -65,10 +65,18 @@ allow-hotplug ${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}" ]

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index ef83c72..4ed1c6d 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -66,6 +66,17 @@ 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
@@ -90,7 +101,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
-               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
+               add_sudoers_file
 
                if [ -x /root/usr/bin/orca ]
                then
@@ -112,7 +123,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
-               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
+               add_sudoers_file
 
                remove_applet fast_user_switch
                if [ -x /root/usr/bin/orca ]
@@ -130,7 +141,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
-               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
+               add_sudoers_file
 
                if [ -x /root/usr/bin/orca ]
                then

diff --git a/scripts/live-functions b/scripts/live-functions
index b1d7503..5efe432 100644 (file)
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -9,13 +9,7 @@ log_wait_msg ()
        then
                plymouth message --text="$@"
                plymouth watch-keystroke | read nunya
-       elif [ -x /sbin/usplash_write ]
-       then
-               /sbin/usplash_write "INPUTENTER ${@}"
-               read nunya < /dev/.initramfs/usplash_outfifo
-       else if [ -x /sbin/splashy_update ] ; then
-               /sbin/splashy_update "getstring ${@}" | read nunya
-       fi ; fi
+       fi
 
        _log_msg "Waiting: ${@} ... \n"
 }