summaryrefslogtreecommitdiff
path: root/functions/defaults.sh
diff options
context:
space:
mode:
Diffstat (limited to 'functions/defaults.sh')
-rwxr-xr-xfunctions/defaults.sh22
1 files changed, 21 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5deaa54a2..433360870 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