[SCM] debian-live branch, master, updated. 1.130.1-3-47-g091c4d5

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 091c4d502f745e82d2a2dd793bc0265da55ef29a
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jul 14 10:07:03 2008 +0200

    Defaulting now to aufs if no union= parameter is given.

diff --git a/debian/control b/debian/control
index efa4799..dd22830 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Description: Debian Live initramfs hook
  At boot time it will look for a (read-only) media containing a "/live"
  directory where a root filesystems (often a compressed filesystem image like
  squashfs) is stored. If found, it will create a writable environment, using
- unionfs, for Debian like systems to boot from.
+ aufs or unionfs, for Debian like systems to boot from.
  .
  You probably do not want to install this package onto a non-live system,
  although it will do no harm.
diff --git a/docs/parameters.txt b/docs/parameters.txt
index a9ac3ed..16b5b46 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -46,7 +46,7 @@ live showmounts
 live timezone=TIMEZONE
 live todisk=DEVICE
 live toram
-live union=unionfs|aufs
+live union=aufs|unionfs
 live utc=yes|no
 live xdebconf
 live xvideomode=RESOLUTION
diff --git a/hooks/live b/hooks/live
index 48802fc..4c72f0b 100755
--- a/hooks/live
+++ b/hooks/live
@@ -93,9 +93,9 @@ manual_add_modules squashfs
 manual_add_modules sqlzma
 manual_add_modules unlzma
 
-# Filesystem: unionfs/aufs
-manual_add_modules unionfs
+# Filesystem: aufs/unionfs
 manual_add_modules aufs
+manual_add_modules unionfs
 
 # Filesystem: vfat
 manual_add_modules nls_cp437
diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index 0b1a4bf..eb2e302 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -21,7 +21,7 @@ This includes the Debian Live isos, netboot tarballs, and usb stick images.
 At boot time it will look for a (read-only) media containing a "/live"
 directory where a root filesystems (often a compressed filesystem image like
 squashfs) is stored. If found, it will create a writable environment, using
-unionfs, for Debian like systems to boot from.
+aufs, for Debian like systems to boot from.
 
 You probably do not want to install this package onto a non-live system,
 although it will do no harm.
@@ -252,10 +252,10 @@ Adding this parameter, live-initramfs will try to copy the whole read-only media
 to the computer's RAM before mounting the root filesystem. This could need a lot
 of ram, according to the space used by the read-only media.
 
-  union=**unionfs**|**aufs**::
+  union=**aufs**|**unionfs**::
 
-By default, live-initramfs uses unionfs. With this parameter, you can switch to
-aufs.
+By default, live-initramfs uses aufs. With this parameter, you can switch to
+unionfs.
 
   utc=**yes**|**no**::
 
@@ -283,9 +283,9 @@ Some variables can be configured via this config file (inside the live system).
 This optional file (inside the live media) contains a list of white-space or
 carriage-return-separated file names corresponding to disk images in the "/live"
 directory. If this file exists, only images listed here will be merged into the
-root unionfs, and they will be loaded in the order listed here. The first entry
-in this file will be the "lowest" point in the unionfs, and the last file in
-this list will be on the "top" of the unionfs, directly below /cow.  Without
+root aufs, and they will be loaded in the order listed here. The first entry
+in this file will be the "lowest" point in the aufs, and the last file in
+this list will be on the "top" of the aufs, directly below /cow.  Without
 this file, any images in the "/live" directory are loaded in alphanumeric order.
 
 See also
diff --git a/scripts/live b/scripts/live
index fcaf1ec..f4a4029 100755
--- a/scripts/live
+++ b/scripts/live
@@ -456,7 +456,7 @@ Arguments ()
 
 	if [ -z "${UNIONTYPE}" ]
 	then
-		UNIONTYPE="unionfs"
+		UNIONTYPE="aufs"
 		export UNIONTYPE
 	fi
 }

-- 
debian-live