[Debian-live-changes] r985 - configs/junior/config

[Ben Armstrong]

Author: synrg
Date: 2007-04-08 20:38:31 +0000 (Sun, 08 Apr 2007)
New Revision: 985

Modified:
   configs/junior/config/bootstrap
   configs/junior/config/chroot
   configs/junior/config/common
   configs/junior/config/image
Log:
Use aptitude with recommends disabled

Modified: configs/junior/config/bootstrap
===================================================================
--- configs/junior/config/bootstrap	2007-04-08 10:57:36 UTC (rev 984)
+++ configs/junior/config/bootstrap	2007-04-08 20:38:31 UTC (rev 985)
@@ -12,9 +12,9 @@
 # (Default: empty)
 LIVE_DISTRIBUTION_CONFIG=""
 
-# $LIVE_FLAVOUR: select the flavour to use
+# $LIVE_BOOTSTRAP_FLAVOUR: select the flavour to use
 # (Default: standard)
-LIVE_FLAVOUR="standard"
+LIVE_BOOTSTRAP_FLAVOUR="standard"
 
 # $LIVE_MIRROR_BUILD: set the mirror to fetch packages from
 # (Default: http://ftp.debian.org/debian/)

Modified: configs/junior/config/chroot
===================================================================
--- configs/junior/config/chroot	2007-04-08 10:57:36 UTC (rev 984)
+++ configs/junior/config/chroot	2007-04-08 20:38:31 UTC (rev 985)
@@ -16,9 +16,9 @@
 # (Default: empty)
 LIVE_PACKAGES=""
 
-# $LIVE_PACKAGES_LIST: set the package list to install
+# $LIVE_PACKAGES_LISTS: set the package list to install
 # (Default: standard)
-LIVE_PACKAGES_LIST="gnome-junior"
+LIVE_PACKAGES_LISTS="gnome-junior"
 
 # $LIVE_TASKS: set the tasks to install
 # (Default: empty)
@@ -35,3 +35,7 @@
 # $LIVE_SYSVINIT: enable sysvinit
 # (Default: disabled)
 LIVE_SYSVINIT="disabled"
+
+# $LIVE_INTERACTIVE: set interactive build
+# (Default: disabled)
+LIVE_INTERACTIVE="disabled"

Modified: configs/junior/config/common
===================================================================
--- configs/junior/config/common	2007-04-08 10:57:36 UTC (rev 984)
+++ configs/junior/config/common	2007-04-08 20:38:31 UTC (rev 985)
@@ -2,7 +2,7 @@
 
 # $LH_APT: set package manager
 # (Default: aptitude)
-LH_APT="apt"
+LH_APT="aptitude"
 
 # $LH_APT_FTPPROXY: set apt/aptitude ftp proxy
 # (Default: autodetected or empty)
@@ -21,8 +21,8 @@
 LH_APT_PDIFFS="enabled"
 
 # $LH_APT_RECOMMENDS: enable recommends
-# (Default: enabled)
-LH_APT_RECOMMENDS="enabled"
+# (Default: disabled)
+LH_APT_RECOMMENDS="disabled"
 
 # $LH_APT_SECURE: enable secure
 # (Default: enabled)
@@ -45,7 +45,7 @@
 LH_DEBCONF_PRIORITY="critical"
 
 # $LH_GENISOIMAGE: set the genisoimage program
-# (Default: autodetected)
+# (Default: genisoimage)
 LH_GENISOIMAGE="genisoimage"
 
 # $LH_LOSETUP: set the losetup program
@@ -53,5 +53,5 @@
 LH_LOSETUP="losetup"
 
 # $LIVE_ROOT: set the root directory
-# (Default: debian-live)
-LIVE_ROOT="debian-live"
+# (Default: junior)
+LIVE_ROOT="junior"

Modified: configs/junior/config/image
===================================================================
--- configs/junior/config/image	2007-04-08 10:57:36 UTC (rev 984)
+++ configs/junior/config/image	2007-04-08 20:38:31 UTC (rev 985)
@@ -8,6 +8,14 @@
 # (Default: empty)
 LIVE_ENCRYPTION=""
 
+# $LIVE_USERNAME: set username
+# (Default: user)
+LIVE_USERNAME="user"
+
+# $LIVE_HOSTNAME: set hostname
+# (Default: debian)
+LIVE_HOSTNAME="debian"
+
 # $LIVE_FILESYSTEM: set filesystem
 # (Default: squashfs)
 LIVE_FILESYSTEM="squashfs"
@@ -17,8 +25,8 @@
 LIVE_MEMTEST86="enabled"
 
 # $LIVE_ISO_VOLUME: set iso volume
-# (Default: Debian Live `date +%Y%m%d`)
-LIVE_ISO_VOLUME="Debian Live `date +%Y%m%d`"
+# (Default: Debian Jr. Live `date +%Y%m%d`)
+LIVE_ISO_VOLUME="Debian Jr. Live `date +%Y%m%d`"
 
 # $LIVE_SERVER_ADDRESS: set the netboot server address
 # (Default: 192.168.1.1)
@@ -41,7 +49,7 @@
 LIVE_SYSLINUX_SPLASH=""
 
 # $LIVE_BINARY_IMAGE: set image type
-# (Default: iso)
+# (Default: usb)
 LIVE_BINARY_IMAGE="usb"
 
 # $LIVE_SOURCE_IMAGE: set image type