diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:51 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:18:29 +0100 |
| commit | 8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1 (patch) | |
| tree | 621dc56a00a65ab0eb1fd4e7d42ad4e45d718741 /functions/defaults.sh | |
| parent | 4739146fc6c4de8b16418517bb882312c475195c (diff) | |
| download | live-build-8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1.zip live-build-8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1.tar.gz | |
Adding live-helper 1.0~a7-1.
Diffstat (limited to 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 5deaa54..4333608 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -170,6 +170,12 @@ Set_defaults () fi fi + # Setting tasksel + if [ -z "${LH_TASKSEL}" ] + then + LH_TASKSEL="aptitude" + fi + # Setting root directory if [ -z "${LIVE_ROOT}" ] then @@ -210,6 +216,12 @@ Set_defaults () LH_VERBOSE="disabled" fi + # If we are root, disable root command + if [ "`id -u`" = "0" ] + then + LIVE_ROOT_COMMAND="" + fi + ## config/bootstrap # Setting architecture value @@ -305,7 +317,15 @@ Set_defaults () # Setting sections value if [ -z "${LIVE_SECTIONS}" ] then - LIVE_SECTIONS="main" + case "${LH_MODE}" in + debian) + LIVE_SECTIONS="main" + ;; + + ubuntu) + LIVE_SECTIONS="main restricted" + ;; + esac fi ## config/chroot |