summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS2
-rw-r--r--ChangeLog24
-rw-r--r--debian/changelog8
-rw-r--r--debian/cron.daily24
-rw-r--r--debian/default2
-rwxr-xr-xhelpers/lh_configapt5
-rwxr-xr-xhelpers/lh_debootstrap7
-rwxr-xr-xhelpers/lh_genrootfs7
-rwxr-xr-xhelpers/lh_installapt2
-rwxr-xr-xhelpers/lh_installlinux11
-rw-r--r--src/lists/gnome1
-rw-r--r--src/lists/gnome-core1
-rw-r--r--src/lists/gnome-full1
-rw-r--r--src/lists/gnome-junior1
-rw-r--r--src/lists/kde1
-rw-r--r--src/lists/kde-core1
-rw-r--r--src/lists/kde-core-i18n1
-rw-r--r--src/lists/kde-extra1
-rw-r--r--src/lists/kde-extra-i18n1
-rw-r--r--src/lists/kde-full1
-rw-r--r--src/lists/kde-full-i18n1
-rw-r--r--src/lists/kde-i18n1
-rw-r--r--src/lists/kde-junior1
-rw-r--r--src/lists/x111
-rw-r--r--src/lists/x11-core1
-rw-r--r--src/lists/xfce1
-rw-r--r--src/lists/xfce-junior1
-rwxr-xr-xsrc/main.sh4
-rw-r--r--src/scripts/02defaults.sh23
29 files changed, 102 insertions, 34 deletions
diff --git a/AUTHORS b/AUTHORS
index a95c53245..fb0631e6f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,9 +7,11 @@ Patches (alphabetical order):
* Alex Owen <r.a.owen@qmul.ac.uk>
* Bas Wijnen <wijnen@debian.org>
+ * Cedric Lucantis <omer@no-log.org>
* Frederic Lehobey <Frederic.Lehobey@free.fr>
* Guerkan Senguen <gurkan@linuks.mine.nu>
* Jason D. Clinton <me@jasonclinton.com>
+ * Kai Hendry <hendry@iki.fi>
* Marcelo D. Re <mdre@rectorado.unl.edu.ar>
* Markus Bauer <bauer-markus@web.de>
* Otavio Salvador <otavio@debian.org>
diff --git a/ChangeLog b/ChangeLog
index a28053e26..bdc1dc5de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,30 @@
+2007-03-04 Daniel Baumann <daniel@debian.org>
+
+ * Replaced removal of kernel on minimal flavours with excludes on the
+ mksquashfs call.
+ * Added LIVE_INCLUDE_CHROOT to the manual exported variables as reported
+ by Mathieu Geli <mathieu.geli@gmail.com>.
+ * Exported CODENAME_* manually as reported by Cédric Lucantis
+ <omer@no-log.org>.
+ * Fixed typo s/aptiude/aptitude/ as reported by Kai Hendry
+ <hendry@iki.fi>.
+ * Uploaded 0.99.24.
+
+2007-02-22 Daniel Baumann <daniel@debian.org>
+
+ * Added xresprobe to all x11 lists.
+
+2007-02-22 Daniel Baumann <daniel@debian.org>
+
+ * Applied patches from Otavio Salvador <otavio@debian.org>:
+ - add and cleanup variable exporting in defaults.
+ - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap.
+ * Uploaded 0.99.23.
+
2007-02-21 Daniel Baumann <daniel@debian.org>
* Added gnome-junior, kde-junior and xfce-junior lists.
+ * Uploaded 0.99.22.
2007-02-19 Daniel Baumann <daniel@debian.org>
diff --git a/debian/changelog b/debian/changelog
index e615f8caa..e2e4e3ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+live-package (0.99.24-1) unstable; urgency=low
+
+ * New upstream release:
+ - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by
+ Mathieu Geli <mathieu.geli@gmail.com> (Closes: #412325).
+
+ -- Daniel Baumann <daniel@debian.org> Sun, 3 Mar 2007 12:25:00 +0100
+
live-package (0.99.23-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/cron.daily b/debian/cron.daily
index 26bae00a2..db65e9024 100644
--- a/debian/cron.daily
+++ b/debian/cron.daily
@@ -36,50 +36,50 @@ cd "${AUTOBUILD_DIRECTORY}"
for AUTOBUILD_DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
do
- for AUTOBUILD_FLAVOUR in ${AUTOBUILD_FLAVOURS}
+ for AUTOBUILD_PACKAGE_LIST in ${AUTOBUILD_PACKAGE_LISTS}
do
- if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-iso-log.txt ]
+ if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-iso-log.txt ]
then
# Generating images
mkdir debian-live
- make-live -t iso -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_FLAVOUR} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1
+ make-live -t iso -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_PACKAGE_LIST} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1
fi
if [ -f debian-live/binary.iso ] && [ -f debian-live/source.iso ]
then
# Moving logs
mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log
- mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-iso-log.txt
- mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-iso-packages.txt
+ mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-iso-log.txt
+ mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-iso-packages.txt
# Moving images
mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}
- mv debian-live/binary.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}.iso
+ mv debian-live/binary.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}.iso
mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/source
- mv debian-live/source.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/source/debian-live-${AUTOBUILD_DISTRIBUTION}-source-${AUTOBUILD_FLAVOUR}.iso
+ mv debian-live/source.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/source/debian-live-${AUTOBUILD_DISTRIBUTION}-source-${AUTOBUILD_PACKAGE_LIST}.iso
fi
# Cleanup
rm -rf debian-live
- if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-usb-log.txt ]
+ if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
then
# Generating images
mkdir debian-live
- make-live -t usb -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_FLAVOUR} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1
+ make-live -t usb -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_PACKAGE_LIST} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1
fi
if [ -f debian-live/binary.img ]
then
# Moving logs
mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log
- mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-usb-log.txt
- mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-usb-packages.txt
+ mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-usb-log.txt
+ mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
# Moving images
mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}
- mv debian-live/binary.img "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}.img
+ mv debian-live/binary.img "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}.img
fi
# Cleanup
diff --git a/debian/default b/debian/default
index a829c3f76..43d17d761 100644
--- a/debian/default
+++ b/debian/default
@@ -3,7 +3,7 @@
AUTOBUILD="false"
AUTOBUILD_DISTRIBUTIONS="etch sid"
-AUTOBUILD_FLAVOURS="standard kde-desktop gnome-desktop xfce-desktop"
+AUTOBUILD_PACKAGE_LISTS="standard kde-desktop gnome-desktop xfce-desktop"
AUTOBUILD_OPTIONS="--with-source"
AUTOBUILD_DIRECTORY="/srv/tmp/make-live"
diff --git a/helpers/lh_configapt b/helpers/lh_configapt
index 81ff23a90..cf8a91f91 100755
--- a/helpers/lh_configapt
+++ b/helpers/lh_configapt
@@ -19,6 +19,11 @@ case "${1}" in
apply-recommends)
# Configure recommends
+ if [ ! -d "${LIVE_CHROOT}"/etc/apt/apt.conf.d ]
+ then
+ mkdir -p "${LIVE_CHROOT}"/etc/apt/apt.conf.d
+ fi
+
if [ "${LIVE_RECOMMENDS}" = "yes" ]
then
echo "Aptitude::Recommends-Important \"true\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/00make-live_recommends.conf
diff --git a/helpers/lh_debootstrap b/helpers/lh_debootstrap
index 738179bde..fd43b16ea 100755
--- a/helpers/lh_debootstrap
+++ b/helpers/lh_debootstrap
@@ -8,7 +8,12 @@ then
mkdir -p "${LIVE_CHROOT}"
fi
- debootstrap --arch="${LIVE_ARCHITECTURE}" --variant=buildd "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}"
+ if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ];
+ then
+ LIVE_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LIVE_BOOTSTRAP_CONFIG}"
+ fi
+
+ debootstrap --arch="${LIVE_ARCHITECTURE}" --variant=buildd "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
# Touching stage file
if [ ! -d "${LIVE_ROOT}"/.stage ]
diff --git a/helpers/lh_genrootfs b/helpers/lh_genrootfs
index 9ba4b3175..5853ed271 100755
--- a/helpers/lh_genrootfs
+++ b/helpers/lh_genrootfs
@@ -47,7 +47,12 @@ case "${LIVE_FILESYSTEM}" in
rm "${LIVE_ROOT}"/binary/casper/filesystem.squashfs
fi
- mksquashfs "${LIVE_CHROOT}" "${LIVE_ROOT}"/binary/casper/filesystem.squashfs
+ if [ "${LIVE_FLAVOUR}" = "minimal" ] || [ "${LIVE_FLAVOUR}" = "mini" ]
+ then
+ mksquashfs "${LIVE_CHROOT}" "${LIVE_ROOT}"/binary/casper/filesystem.squashfs -e "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img "${LIVE_CHROOT}"/boot/config-* "${LIVE_CHROOT}"/boot/System.map-*
+ else
+ mksquashfs "${LIVE_CHROOT}" "${LIVE_ROOT}"/binary/casper/filesystem.squashfs
+ fi
if [ -n "$LIVE_ENCRYPTION" ]
then
diff --git a/helpers/lh_installapt b/helpers/lh_installapt
index 024303d89..ec199312e 100755
--- a/helpers/lh_installapt
+++ b/helpers/lh_installapt
@@ -23,7 +23,7 @@ then
if [ -n "${REPOSITORY_KEYRING}" ]
then
- lh_chroot "aptiude install ${REPOSITORY_KEYRING}"
+ lh_chroot "aptitude install ${REPOSITORY_KEYRING}"
elif [ -n "${REPOSITORY_KEY}" ]
then
lh_chroot "wget ${REPOSITORY_KEY}"
diff --git a/helpers/lh_installlinux b/helpers/lh_installlinux
index 40897d802..24dd7d1e0 100755
--- a/helpers/lh_installlinux
+++ b/helpers/lh_installlinux
@@ -21,12 +21,5 @@ case "${1}" in
esac
# Installing linux image
-if [ "${LIVE_FLAVOUR}" = "minimal" ] || [ "${LIVE_FLAVOUR}" = "mini" ]
-then
- mv "${LIVE_CHROOT}"/boot/vmlinuz* "${DESTDIR}"/vmlinuz
- mv "${LIVE_CHROOT}"/boot/initrd.img* "${DESTDIR}"/initrd.gz
- rm -f "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img
-else
- cp "${LIVE_CHROOT}"/boot/vmlinuz* "${DESTDIR}"/vmlinuz
- cp "${LIVE_CHROOT}"/boot/initrd.img* "${DESTDIR}"/initrd.gz
-fi
+cp "${LIVE_CHROOT}"/boot/vmlinuz* "${DESTDIR}"/vmlinuz
+cp "${LIVE_CHROOT}"/boot/initrd.img* "${DESTDIR}"/initrd.gz
diff --git a/src/lists/gnome b/src/lists/gnome
index 6b8dc44f9..2c0e90171 100644
--- a/src/lists/gnome
+++ b/src/lists/gnome
@@ -14,3 +14,4 @@ desktop-base
rhythmbox synaptic
x-window-system-core
+xresprobe
diff --git a/src/lists/gnome-core b/src/lists/gnome-core
index 05a7a5ed6..f60ad4c20 100644
--- a/src/lists/gnome-core
+++ b/src/lists/gnome-core
@@ -11,3 +11,4 @@ gdm gnome-core
desktop-base
x-window-system-core
+xresprobe
diff --git a/src/lists/gnome-full b/src/lists/gnome-full
index 89cd662b7..2256d3f99 100644
--- a/src/lists/gnome-full
+++ b/src/lists/gnome-full
@@ -11,3 +11,4 @@ gdm gnome
desktop-base
x-window-system-core
+xresprobe
diff --git a/src/lists/gnome-junior b/src/lists/gnome-junior
index 16444565f..67fa88f85 100644
--- a/src/lists/gnome-junior
+++ b/src/lists/gnome-junior
@@ -14,6 +14,7 @@ desktop-base
rhythmbox synaptic
x-window-system-core
+xresprobe
# Debian Junior
junior-sound junior-typing junior-internet junior-gnome junior-toys
diff --git a/src/lists/kde b/src/lists/kde
index 7379921d6..cb88c9a58 100644
--- a/src/lists/kde
+++ b/src/lists/kde
@@ -11,3 +11,4 @@ kde kdm
desktop-base
x-window-system-core
+xresprobe
diff --git a/src/lists/kde-core b/src/lists/kde-core
index 061e09384..74ad015a4 100644
--- a/src/lists/kde-core
+++ b/src/lists/kde-core
@@ -11,3 +11,4 @@ kde-core kdm
desktop-base
x-window-system-core
+xresprobe
diff --git a/src/lists/kde-core-i18n b/src/lists/kde-core-i18n
index 3b4359ef7..1a2619e6e 100644
--- a/src/lists/kde-core-i18n
+++ b/src/lists/kde-core-i18n
@@ -17,6 +17,7 @@ kde-core kdm
desktop-base
x-window-system-core
+xresprobe
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-extra b/src/lists/kde-extra
index 196ac06a0..bd8e17f26 100644
--- a/src/lists/kde-extra
+++ b/src/lists/kde-extra
@@ -11,6 +11,7 @@ kde kdm
desktop-base
x-window-system-core
+xresprobe
# KDE Full
koffice
diff --git a/src/lists/kde-extra-i18n b/src/lists/kde-extra-i18n
index e14fb270b..4210c17f2 100644
--- a/src/lists/kde-extra-i18n
+++ b/src/lists/kde-extra-i18n
@@ -17,6 +17,7 @@ kde kdm
desktop-base
x-window-system-core
+xresprobe
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-full b/src/lists/kde-full
index dc6ba5b6f..83c784895 100644
--- a/src/lists/kde-full
+++ b/src/lists/kde-full
@@ -11,6 +11,7 @@ kde kdm
desktop-base
x-window-system-core
+xresprobe
# KDE Full
koffice
diff --git a/src/lists/kde-full-i18n b/src/lists/kde-full-i18n
index 8b0cfef2d..ecc4614d9 100644
--- a/src/lists/kde-full-i18n
+++ b/src/lists/kde-full-i18n
@@ -17,6 +17,7 @@ kde kdm
desktop-base
x-window-system-core
+xresprobe
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-i18n b/src/lists/kde-i18n
index af135c88a..5576b20b0 100644
--- a/src/lists/kde-i18n
+++ b/src/lists/kde-i18n
@@ -17,6 +17,7 @@ kde kdm
desktop-base
x-window-system-core
+xresprobe
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-junior b/src/lists/kde-junior
index d2afa1b9a..1b067a50e 100644
--- a/src/lists/kde-junior
+++ b/src/lists/kde-junior
@@ -11,6 +11,7 @@ kde kdm
desktop-base
x-window-system-core
+xresprobe
# Debian Junior
junior-sound junior-typing junior-internet junior-toys junior-games-net
diff --git a/src/lists/x11 b/src/lists/x11
index 759ae18d8..65600a03e 100644
--- a/src/lists/x11
+++ b/src/lists/x11
@@ -8,3 +8,4 @@ console-common locales
# X11
xdm x-window-system
+xresprobe
diff --git a/src/lists/x11-core b/src/lists/x11-core
index af33eb0f2..fe6ab32f2 100644
--- a/src/lists/x11-core
+++ b/src/lists/x11-core
@@ -8,3 +8,4 @@ console-common locales
# X11
xdm x-window-system-core
+xresprobe
diff --git a/src/lists/xfce b/src/lists/xfce
index 0e95148c6..8d27123ef 100644
--- a/src/lists/xfce
+++ b/src/lists/xfce
@@ -11,3 +11,4 @@ gdm xfce4
desktop-base
x-window-system-core
+xresprobe
diff --git a/src/lists/xfce-junior b/src/lists/xfce-junior
index 5643fc2c2..0ad7887ef 100644
--- a/src/lists/xfce-junior
+++ b/src/lists/xfce-junior
@@ -11,6 +11,7 @@ gdm xfce4
desktop-base
x-window-system-core
+xresprobe
# Debian Junior
junior-sound junior-typing junior-internet junior-gnome junior-toys
diff --git a/src/main.sh b/src/main.sh
index 3403d44aa..b56c91a45 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -28,7 +28,7 @@ set -e
BASE=${LIVE_BASE:-"/usr/share/make-live"}
CONFIG="/etc/make-live.conf"
PROGRAM="`basename ${0}`"
-VERSION="0.99.23"
+VERSION="0.99.24"
export VERSION
@@ -37,6 +37,8 @@ CODENAME_STABLE="sarge"
CODENAME_TESTING="etch"
CODENAME_UNSTABLE="sid"
+export CODENAME_OLDSTABLE CODENAME_STABLE CODENAME_TESTING CODENAME_UNSTABLE
+
# Source sub scripts
for SCRIPT in `find ${BASE}/scripts/ -not -name '*~' -not -wholename "${BASE}/scripts/.*" -and -type f`
do
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index 3960e723a..a59735b7b 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -72,10 +72,10 @@ Defaults ()
then
LIVE_DISTRIBUTION="unstable"
LIVE_DISTRIBUTION_EXPERIMENTAL="yes"
- export LIVE_DISTRIBUTION_EXPERIMENTAL
fi
export LIVE_DISTRIBUTION
+ export LIVE_DISTRIBUTION_EXPERIMENTAL
# Set bootstrap flavour
if [ -z "${LIVE_FLAVOUR}" ]
@@ -170,9 +170,10 @@ Defaults ()
LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES} loop-aes-modules-2.6-${LIVE_KERNEL} loop-aes-utils"
fi
- export LIVE_KERNEL_PACKAGES
fi
+ export LIVE_KERNEL_PACKAGES
+
# Set debian mirror
if [ -z "${LIVE_MIRROR}" ]
then
@@ -185,34 +186,35 @@ Defaults ()
if [ -z "${LIVE_REPOSITORY_KEYRING}" ]
then
LIVE_REPOSITORY_KEYRING="debian-archive-keyring"
- export LIVE_REPOSITORY_KEYRING
fi
+ export LIVE_REPOSITORY_KEYRING
+
# Set debian security mirror
if [ -z "${LIVE_MIRROR_SECURITY}" ]
then
LIVE_MIRROR_SECURITY="http://security.debian.org/"
- export LIVE_MIRROR_SECURITY
fi
+ export LIVE_MIRROR_SECURITY
+
# Set default aptitude tasks
if [ "${LIVE_PACKAGE_LIST}" = "gnome-desktop" ]
then
LIVE_PACKAGE_LIST="gnome"
LIVE_TASKS="${LIVE_TASKS} standard laptop desktop gnome-desktop"
- export LIVE_PACKAGE_LIST LIVE_TASKS
elif [ "${LIVE_PACKAGE_LIST}" = "kde-desktop" ]
then
LIVE_PACKAGE_LIST="kde"
LIVE_TASKS="${LIVE_TASKS} standard laptop desktop kde-desktop"
- export LIVE_PACKAGE_LIST LIVE_TASKS
elif [ "${LIVE_PACKAGE_LIST}" = "xfce-desktop" ]
then
LIVE_PACKAGE_LIST="xfce"
LIVE_TASKS="${LIVE_TASKS} standard laptop desktop xfce-desktop"
- export LIVE_PACKAGE_LIST LIVE_TASKS
fi
+ export LIVE_PACKAGE_LIST LIVE_TASKS
+
# Check for package lists
if [ -z "${LIVE_PACKAGE_LIST}" ]
then
@@ -242,6 +244,11 @@ Defaults ()
export LIVE_PACKAGE_LIST
+ if [ -n "${LIVE_PACKAGES}" ]
+ then
+ export LIVE_PACKAGES
+ fi
+
# Set FTP proxy
if [ -z "${LIVE_PROXY_FTP}" ] && [ -n "${ftp_proxy}" ]
then
@@ -365,5 +372,5 @@ Defaults ()
# Variables that do not have defaults but need to be exported to
# allow other helpers to use their values
- export LIVE_BOOTSTRAP_CONFIG
+ export LIVE_BOOTAPPEND LIVE_BOOTSTRAP_CONFIG LIVE_INCLUDE_CHROOT LIVE_PRESEED
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 19:47:04 +0000