Resync with Debian 1.139.1-2

diff --git a/debian/changelog b/debian/changelog
index 78919c2..07be76e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.139.1-2grml.01) unstable; urgency=low
+
+  * Resync with Debian's 1.139.1-2 version.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 15 Sep 2008 17:28:20 +0200
+
 live-initramfs (1.139.1-1grml.01) unstable; urgency=low
 
   * Resync with Debian's 1.139.1-1 version.

diff --git a/docs/parameters.txt b/docs/parameters.txt
index 16b5b46..e09089d 100644 (file)
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -35,7 +35,7 @@ live noxautologin
 live nofastboot
 live nopersistent
 live nosudo
-live noswap
+live swapon
 live nouser
 live noxautoconfig
 live persistent

diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index eb2e302..a66a85c 100644 (file)
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -183,9 +183,9 @@ Do not prompt to eject the CD on reboot.
 
 This parameter disables the automatic configuration of sudo.
 
-  noswap::
+  swapon::
 
-This parameter disables usage of local swap partitions.
+This parameter enables usage of local swap partitions.
 
   nouser::
 

diff --git a/scripts/live b/scripts/live
index 0363daf..5744998 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -285,9 +285,9 @@ Arguments ()
                                export NOSUDO
                                ;;
 
-                       noswap)
-                               NOSWAP="Yes"
-                               export NOSWAP
+                       swapon)
+                               SWAPON="Yes"
+                               export SWAPON
                                ;;
 
                        noupdatenotifier)
@@ -538,7 +538,7 @@ mount_images_in_directory ()
 {
        directory="${1}"
        rootmnt="${2}"
-       mac="${3}"
+       mac="${3}"
 
 
        if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
@@ -1040,6 +1040,12 @@ setup_unionfs ()
                                panic "Unknown file system type on ${backdev} (${image})"
                        fi
 
+                       if [ -z "${fstype}" ]
+                       then
+                               fstype="${imagename##*.}"
+                               log_warning_msg "Unknown file system type on ${backdev} (${image}), assuming ${fstype}."
+                       fi
+
                        mkdir -p "${croot}/${imagename}"
                        log_begin_msg "Mounting \"${image}\" on \"${croot}${imagename}\" via \"${backdev}\""
                        mount -n -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
@@ -1332,12 +1338,13 @@ set_usplash_timeout ()
        if [ -x /sbin/usplash_write ]
        then
                /sbin/usplash_write "TIMEOUT 120"
-       fi
+       else if [ -x /sbin/splashy_update ] ; then
+               /sbin/splashy_update "TIMEOUT 120"
+       fi ; fi
 }
 
 mountroot ()
 {
-    
         if [ -x /scripts/local-top/cryptroot ]; then
            /scripts/local-top/cryptroot
        fi
@@ -1350,7 +1357,7 @@ mountroot ()
        tailpid="${!}"
 
        # Ensure 'panic' function is overridden
-       . /scripts/live-functions
+       . /scripts/live-functions
 
        Arguments
 

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index ecbdce1..1975bd5 100755 (executable)
--- a/scripts/live-bottom/13swap
+++ b/scripts/live-bottom/13swap
@@ -20,7 +20,7 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOSWAP}" ] || [ -n "${NOFSTAB}" ]
+if [ -z "${SWAPON}" ] || [ -n "${NOFSTAB}" ]
 then
        exit 0
 fi

diff --git a/scripts/live-functions b/scripts/live-functions
index 0684dc0..49b4a3a 100644 (file)
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -2,47 +2,6 @@
 . /scripts/functions
 . /live.vars
 
-# Override log_*_msg until #494257 is merged
-
-_log_msg()
-{
-       if [ "$quiet" = "y" ]; then return; fi
-       printf "$@"
-}
-
-log_success_msg()
-{
-       _log_msg "Success: $@\n"
-}
-
-log_failure_msg()
-{
-       _log_msg "Failure: $@\n"
-}
-
-log_warning_msg()
-{
-       _log_msg "Warning: $@\n"
-}
-
-log_begin_msg()
-{
-       if [ -x /sbin/usplash_write ]; then
-               /sbin/usplash_write "TEXT $@"
-       fi
-       _log_msg "Begin: $@ ... "
-}
-
-log_end_msg()
-{
-       if [ -x /sbin/usplash_write ]; then
-               /sbin/usplash_write "SUCCESS ok"
-       fi
-       _log_msg "done.\n"
-}
-
-##
-
 log_wait_msg ()
 {
        # Print a message and wait for enter
@@ -50,7 +9,9 @@ log_wait_msg ()
        then
                /sbin/usplash_write "INPUTENTER ${@}"
                read nunya < /dev/.initramfs/usplash_outfifo
-       fi
+       else if [ -x /sbin/splashy_update ] ; then
+               /sbin/splashy_update "getstring ${@}" | read nunya
+       fi ; fi
 
        _log_msg "Waiting: ${@} ... \n"
 }
@@ -122,9 +83,8 @@ panic() {
        printf "     ${DEB_4}  This Debian Live image failed to boot.\n\n"
 
        printf "  Please file a bug against the 'live-initramfs' package or email the Debian\n"
-       printf "  Live mailing list at <debian-live-devel@lists.alioth.debian.org>, making\n"
-       printf "  sure to note the exact version, name and distribution of the image you were\n"
-       printf "  attempting to boot.\n\n"
+       printf "  Live mailing list at <debian-live@lists.debian.org>, making sure to note the\n"
+       printf "  exact version, name and distribution of the image you were attempting to boot.\n\n"
 
        printf "  The file ${LIVELOG} contains some debugging information but booting with the\n"
        printf "  ${DEBUG} command-line parameter will greatly increase its verbosity which is\n"