[Debian-live-changes] r1125 - in dists/trunk/live-helper: doc functions

[Daniel Baumann]

Author: daniel
Date: 2007-04-22 09:17:29 +0000 (Sun, 22 Apr 2007)
New Revision: 1125

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/functions/defaults.sh
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-22 09:15:10 UTC (rev 1124)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-22 09:17:29 UTC (rev 1125)
@@ -1,5 +1,7 @@
 2007-04-22  Daniel Baumann  <daniel at debian.org>
 
+	* functions/defaults.sh:
+	  - In ubuntu mode, setting default sections to main restricted.
 	* helpers/lh_binary_grub:
 	  - Making copy call of grub arch independent.
 	* helpers/lh_chroot_sources:

Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-04-22 09:15:10 UTC (rev 1124)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-04-22 09:17:29 UTC (rev 1125)
@@ -311,7 +311,15 @@
 	# 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