Skip to content

Commit

Permalink
Defaulting now to aufs if no union= parameter is given.
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-baumann committed Jul 14, 2008
1 parent 40fac11 commit 9746eca
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion debian/control
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/parameters.txt
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hooks/live
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions manpages/live-initramfs.en.7.txt
Expand Up @@ -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.
Expand Down Expand Up @@ -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**::

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/live
Expand Up @@ -456,7 +456,7 @@ Arguments ()

if [ -z "${UNIONTYPE}" ]
then
UNIONTYPE="unionfs"
UNIONTYPE="aufs"
export UNIONTYPE
fi
}
Expand Down

0 comments on commit 9746eca

Please sign in to comment.