diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:12 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:19:41 +0100 |
| commit | 504c05c3a63de0af4fd0e876274afc039c5c0ed1 (patch) | |
| tree | 5a29d0f82735a131c9319b5b825c57b740584d13 /functions | |
| parent | 37a5c53ddd2825bf6b0ce521908a63d419683981 (diff) | |
| download | live-build-504c05c3a63de0af4fd0e876274afc039c5c0ed1.zip live-build-504c05c3a63de0af4fd0e876274afc039c5c0ed1.tar.gz | |
Adding live-helper 1.0~a15-1.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/common.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/functions/common.sh b/functions/common.sh index 5c25e29..71011bd 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a14" +VERSION="1.0~a15" diff --git a/functions/defaults.sh b/functions/defaults.sh index 8179ec3..56dd5ae 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -411,7 +411,12 @@ Set_defaults () then case "${LH_MODE}" in debian) - LIVE_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6" + LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6" + + if [ "${LIVE_CHROOT_FILESYSTEM}" = "squashfs" ] + then + LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} squashfs-modules-2.6" + fi ;; ubuntu) @@ -502,6 +507,9 @@ Set_defaults () # Setting debian-installer option LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER:-disabled}" + # Setting live-installer option + LIVE_LIVE_INSTALLER="${LIVE_LIVE_INSTALLER:-disabled}" + # Setting encryption # LIVE_ENCRYPTION |