summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
19 files changed, 35 insertions, 9 deletions
diff --git a/src/lists/gnome b/src/lists/gnome
index 6b8dc44..2c0e901 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 05a7a5e..f60ad4c 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 89cd662..2256d3f 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 1644456..67fa88f 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 7379921..cb88c9a 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 061e093..74ad015 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 3b4359e..1a2619e 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 196ac06..bd8e17f 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 e14fb27..4210c17 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 dc6ba5b..83c7848 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 8b0cfef..ecc4614 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 af135c8..5576b20 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 d2afa1b..1b067a5 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 759ae18..65600a0 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 af33eb0..fe6ab32 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 0e95148..8d27123 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 5643fc2..0ad7887 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 3403d44..b56c91a 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 3960e72..a59735b 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.0 at 2024-07-02 18:14:29 +0000