From 504c05c3a63de0af4fd0e876274afc039c5c0ed1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 10:05:12 +0200 Subject: Adding live-helper 1.0~a15-1. --- functions/common.sh | 2 +- functions/defaults.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'functions') diff --git a/functions/common.sh b/functions/common.sh index 5c25e29b0..71011bd85 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 8179ec3e9..56dd5ae21 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 -- cgit v1.2.3