Adding upstream version 1.154.6.

diff --git a/Makefile b/Makefile
index b9a9e6d..40ce7af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ test:
        fi
 
 build:
+       $(MAKE) -C manpages
 
 install: test build
        # Installing configuration
@@ -126,6 +127,7 @@ update:
                "http://svn.debian.org/viewsvn/*checkout*/d-i/trunk/packages/localechooser/languagelist"
 
 clean:
+       $(MAKE) -C manpages clean
 
 distclean:
 

diff --git a/bin/live-new-uuid b/bin/live-new-uuid
index 4a6afa6..97cc7d4 100755 (executable)
--- a/bin/live-new-uuid
+++ b/bin/live-new-uuid
@@ -1,9 +1,9 @@
 #!/bin/sh
 # -*- coding: utf-8 -*-
 #
-# «casper-new-uuid» - Creates and injects new UUIDs for casper disks
+# «live-new-uuid» - Creates and injects new UUIDs for live disks
 #
-# Create new UUIDs for disks to prevent conflicts and booting the wrong casper
+# Create new UUIDs for disks to prevent conflicts and booting the wrong live
 # directory.  Particularly useful in creating recovery disks that need to be
 # able to also work with recovery partitioning schemes.
 #
@@ -31,14 +31,14 @@ set -e
 
 help() {
  echo
- echo "USAGE: $0 initrd.gz <path-to-new-initrd.gz> <path-to-new-casper-uuid> "
+ echo "USAGE: $0 initrd.gz <path-to-new-initrd.gz> <path-to-new-live-uuid> "
  echo
  echo "initrd.gz is the absolute path to the original gzipped initramfs"
  echo "<path-to-new-initrd.gz> is the destination directory for the new gzipped initramfs"
- echo "<path-to-new-casper-uuid> is the destination directory for the new casper-uuid-TYPE "
+ echo "<path-to-new-live-uuid> is the destination directory for the new live-uuid-TYPE "
  echo
  echo "if either path is absent, they will end up in the current directory "
- echo "TYPE is determined by an already existing casper-uuid-* or by 'uname -s'"
+ echo "TYPE is determined by an already existing live-uuid-* or by 'uname -s'"
 }
 
 if [ "$#" = "0" ] || [ "x$1" = x-h ] || [ "x$1" = x--help ]; then
@@ -57,19 +57,19 @@ else
 fi
 
 if [ -z "$3" ] || [ ! -d "$3" ] || [ "$3" = "." ]; then
-       CASPERDIR="$CWD"
+       LIVEDIR="$CWD"
 else
-       CASPERDIR="$3"
+       LIVEDIR="$3"
 fi
 
 cd "$TEMPDIR"
 zcat "$1" | cpio -id
 uuidgen -r > conf/uuid.conf
 find . | cpio --quiet --dereference -o -H newc | gzip > "$GZIPDIR/initrd.gz"
-if [ "$(ls "$CASPERDIR/casper-uuid"-* >/dev/null 2>&1 | wc -l)" = 1 ]; then
-    cp conf/uuid.conf "$CASPERDIR/casper-uuid"-*
+if [ "$(ls "$LIVEDIR/live-uuid"-* >/dev/null 2>&1 | wc -l)" = 1 ]; then
+    cp conf/uuid.conf "$LIVEDIR/live-uuid"-*
 else
-    cp conf/uuid.conf "$CASPERDIR/casper-uuid-$TYPE"
+    cp conf/uuid.conf "$LIVEDIR/live-uuid-$TYPE"
 fi
 cd "$CWD"
 rm -rf "$TEMPDIR"

diff --git a/docs/parameters.txt b/docs/parameters.txt
index fd05339..921e0c4 100644 (file)
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -39,6 +39,7 @@ live swapon
 live nouser
 live noxautoconfig
 live persistent[=nofiles]
+live persistent-path=PATH
 live {preseed/file|file}=FILE
 live package/question=VALUE
 live quickreboot

diff --git a/hooks/live b/hooks/live
index f2984f4..8a1be02 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -149,6 +149,9 @@ else
 fi
 copy_exec /usr/bin/udevinfo /bin
 
+# Program: wc
+copy_exec /usr/bin/wc /bin
+
 # Program: wget
 if [ -x /usr/bin/wget ]
 then

diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index de8a67c..687a939 100644 (file)
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -208,6 +208,12 @@ informations. If "nofiles" is specified, only filesystems with matching labels
 will be searched; no filesystems will be traversed looking for archives or image
 files. This results in shorter boot times.
 
+  persistent-path=PATH
+
+live-initramfs will look for persistency files in the root directory of a partition,
+with this parameter, the path can be configured so that you can have multiple
+directories on the same partition to store persistency files.
+
   {preseed/file|file}=**FILE**::
 
 A path to a file present on the rootfs could be used to preseed debconf

diff --git a/scripts/live b/scripts/live
index d06dd20..bf90781 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -340,6 +340,11 @@ Arguments ()
                                export PERSISTENT
                                ;;
 
+                       persistent-path=*)
+                               PERSISTENT_PATH="${ARGUMENT#persistent-path=}"
+                               export PERSISTENT_PATH
+                               ;;
+
                        nopersistent)
                                NOPERSISTENT="Yes"
                                export NOPERSISTENT

diff --git a/scripts/live-helpers b/scripts/live-helpers
index adb56b7..8970834 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -206,7 +206,7 @@ setup_loop ()
                        dev=$(sys2dev "${loopdev}")
                        options=''
 
-                       if [ -n ${readonly} ]
+                       if [ -n "${readonly}" ]
                        then
                                if losetup --help 2>&1 | grep -q -- "-r\b"
                                then
@@ -299,6 +299,13 @@ find_cow_device ()
        cow_backing="/${pers_label}-backing"
        black_listed_devices="${2}"
 
+       if [ -z "${PERSISTENT_PATH}" ]
+       then
+               pers_fpath=${cow_backing}/${pers_label}
+       else
+               pers_fpath=${cow_backing}/${PERSISTENT_PATH}/${pers_label}
+       fi
+
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
        do
                for dev in $(subdevices "${sysblock}")
@@ -332,9 +339,9 @@ find_cow_device ()
                                                break
                                        fi
 
-                                       if [ -f "${cow_backing}/${pers_label}" ]
+                                       if [ -f "${pers_fpath}" ]
                                        then
-                                               echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+                                               echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
                                                return 0
                                        else
                                                umount ${cow_backing}