diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:13 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:25 +0100 |
| commit | cd5110f6b8eb77519d704972276cfd5be6bff055 (patch) | |
| tree | 3bc1bcdbff4ec3bd5a82ae34d9efed47b157e3e0 /functions/defaults.sh | |
| parent | fdef63e60c2e68226da2fe92d6cc393c1af2b801 (diff) | |
| download | vyos-live-build-cd5110f6b8eb77519d704972276cfd5be6bff055.tar.gz vyos-live-build-cd5110f6b8eb77519d704972276cfd5be6bff055.zip | |
Adding live-helper 1.0~a17-1.
Diffstat (limited to 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 56dd5ae21..1dacb9262 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -38,7 +38,7 @@ Set_defaults () fi fi - # Setting distribution value + # Setting distribution name if [ -z "${LIVE_DISTRIBUTION}" ] then case "${LH_MODE}" in @@ -90,7 +90,7 @@ Set_defaults () LH_APT_SECURE="${LH_APT_SECURE:-enabled}" # Setting bootstrap program - if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "${LH_BOOTSTRAP}" ] + if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "`which ${LH_BOOTSTRAP}`" ] then case "${LH_MODE}" in debian) @@ -318,6 +318,9 @@ Set_defaults () # Setting chroot filesystem LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM:-squashfs}" + # Setting union filesystem + LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM:-unionfs}" + # LIVE_HOOKS # Setting interactive shell/X11/Xnest @@ -350,7 +353,7 @@ Set_defaults () ;; arm) - echo "E: You need to specify the linux kernel flavour manually on arm (FIXME)." + Echo_error "You need to specify the linux kernel flavour manually on arm (FIXME)." exit 1 ;; @@ -375,7 +378,7 @@ Set_defaults () ;; m68k) - LIVE_LINUX_FLAVOURS="E: You need to specify the linux kernel flavour manually on m68k." + LIVE_LINUX_FLAVOURS="You need to specify the linux kernel flavour manually on m68k." exit 1 ;; @@ -401,7 +404,7 @@ Set_defaults () ;; *) - echo "E: Architecture notyet supported (FIXME)" + Echo_error "Architecture notyet supported (FIXME)" ;; esac fi @@ -411,7 +414,7 @@ Set_defaults () then case "${LH_MODE}" in debian) - LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6" + LIVE_LINUX_PACKAGES="linux-image-2.6 ${LIVE_UNION_FILESYSTEM}-modules-2.6" if [ "${LIVE_CHROOT_FILESYSTEM}" = "squashfs" ] then @@ -507,9 +510,6 @@ 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 |