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/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/xfce1
-rwxr-xr-xsrc/main.sh21
-rw-r--r--src/scripts/02defaults.sh23
-rw-r--r--src/scripts/13chroot.sh (renamed from src/scripts/14chroot.sh)15
-rw-r--r--src/scripts/13hack.sh23
16 files changed, 48 insertions, 46 deletions
diff --git a/src/lists/gnome b/src/lists/gnome
index 8474dd5a8..6b8dc44f9 100644
--- a/src/lists/gnome
+++ b/src/lists/gnome
@@ -9,6 +9,7 @@ console-common locales
# GNOME
gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
gnome-themes-extras
+desktop-base
rhythmbox synaptic
diff --git a/src/lists/gnome-core b/src/lists/gnome-core
index e1a9cacc2..05a7a5ed6 100644
--- a/src/lists/gnome-core
+++ b/src/lists/gnome-core
@@ -8,5 +8,6 @@ console-common locales
# GNOME Core
gdm gnome-core
+desktop-base
x-window-system-core
diff --git a/src/lists/gnome-full b/src/lists/gnome-full
index f3d17b553..89cd662b7 100644
--- a/src/lists/gnome-full
+++ b/src/lists/gnome-full
@@ -8,5 +8,6 @@ console-common locales
# GNOME Full
gdm gnome
+desktop-base
x-window-system-core
diff --git a/src/lists/kde b/src/lists/kde
index 2f815105e..7379921d6 100644
--- a/src/lists/kde
+++ b/src/lists/kde
@@ -8,5 +8,6 @@ console-common locales
# KDE
kde kdm
+desktop-base
x-window-system-core
diff --git a/src/lists/kde-core b/src/lists/kde-core
index 020f4f4b3..061e09384 100644
--- a/src/lists/kde-core
+++ b/src/lists/kde-core
@@ -8,5 +8,6 @@ console-common locales
# KDE Core
kde-core kdm
+desktop-base
x-window-system-core
diff --git a/src/lists/kde-core-i18n b/src/lists/kde-core-i18n
index 060232823..3b4359ef7 100644
--- a/src/lists/kde-core-i18n
+++ b/src/lists/kde-core-i18n
@@ -14,6 +14,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE Core
kde-core kdm
+desktop-base
x-window-system-core
diff --git a/src/lists/kde-extra b/src/lists/kde-extra
index ca3212c3e..196ac06a0 100644
--- a/src/lists/kde-extra
+++ b/src/lists/kde-extra
@@ -8,6 +8,7 @@ console-common locales
# KDE
kde kdm
+desktop-base
x-window-system-core
diff --git a/src/lists/kde-extra-i18n b/src/lists/kde-extra-i18n
index 56b775b78..e14fb270b 100644
--- a/src/lists/kde-extra-i18n
+++ b/src/lists/kde-extra-i18n
@@ -14,6 +14,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE
kde kdm
+desktop-base
x-window-system-core
diff --git a/src/lists/kde-full b/src/lists/kde-full
index 624ff80db..dc6ba5b6f 100644
--- a/src/lists/kde-full
+++ b/src/lists/kde-full
@@ -8,6 +8,7 @@ console-common locales
# KDE
kde kdm
+desktop-base
x-window-system-core
diff --git a/src/lists/kde-full-i18n b/src/lists/kde-full-i18n
index aacb425e3..8b0cfef2d 100644
--- a/src/lists/kde-full-i18n
+++ b/src/lists/kde-full-i18n
@@ -14,6 +14,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE
kde kdm
+desktop-base
x-window-system-core
diff --git a/src/lists/kde-i18n b/src/lists/kde-i18n
index a53271937..af135c88a 100644
--- a/src/lists/kde-i18n
+++ b/src/lists/kde-i18n
@@ -14,6 +14,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE
kde kdm
+desktop-base
x-window-system-core
diff --git a/src/lists/xfce b/src/lists/xfce
index b1f5049c4..0e95148c6 100644
--- a/src/lists/xfce
+++ b/src/lists/xfce
@@ -8,5 +8,6 @@ console-common locales
# Xfce
gdm xfce4
+desktop-base
x-window-system-core
diff --git a/src/main.sh b/src/main.sh
index cb65d7d5d..20bc5c564 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.18"
+VERSION="0.99.19"
CODENAME_OLDSTABLE="woody"
CODENAME_STABLE="sarge"
@@ -41,7 +41,7 @@ do
. "${SCRIPT}"
done
-USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--clone DIRECTORY] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--with-generic-indices] [--without-generic-indices] [--with-recommends] [--without-recommends] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--manifest PACKAGE] [-m|--mirror URL] [-k|--keyring] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--preseed FILE] [--proxy-ftp URL] [--proxy-http URL] [--repositories NAME] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]"
+USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--clone DIRECTORY] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--with-generic-indices] [--without-generic-indices] [--with-recommends] [--without-recommends] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--manifest PACKAGE] [-m|--mirror URL] [-k|--keyring] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--preseed FILE] [--proxy-ftp URL] [--proxy-http URL] [--repositories NAME] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE] [--tasks TASK]"
Help ()
{
@@ -92,6 +92,7 @@ Help ()
echo " --server-path: specifies the netboot server path for chroot."
echo " --templates: specifies location of the templates."
echo " -t, --type: specifies live system type."
+ echo " --tasks: specifies one or more aptitude tasks."
echo " --with-generic-indices: enables generic debian package indices (default)."
echo " --without-generic-indices: disables generic debian package indices."
echo " --with-recommends: installes recommended packages too."
@@ -165,7 +166,7 @@ Configuration ()
Main ()
{
- ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,clone:,config:,chroot:,distribution:,filesystem:,flavour:,bootstrap-config:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,keyring:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,preseed:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-recommends,without-recommends,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "${@}"`"
+ ARGUMENTS="`getopt --longoptions root:,tasks:,type:,architecture:,bootappend:,clone:,config:,chroot:,distribution:,filesystem:,flavour:,bootstrap-config:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,keyring:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,preseed:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-recommends,without-recommends,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "${@}"`"
if [ "${?}" != "0" ]
then
@@ -186,6 +187,10 @@ Main ()
LIVE_TYPE="${2}"; shift 2
;;
+ --tasks)
+ LIVE_TASKS="${2}"; shift 2
+ ;;
+
-a|--architecture)
LIVE_ARCHITECTURE="${2}"; shift 2
;;
@@ -348,16 +353,6 @@ Main ()
Configuration
Defaults
- # Distribution
- if [ "${1}" = "dist" ]
- then
- for FLAVOUR in minimal standard gnome kde xfce
- do
- ( make-live -d testing -o "debian-live-${CODENAME_TESTING}-`dpkg --print-architecture`-${FLAVOUR}-" -p ${FLAVOUR} --with-source && cd "${LIVE_ROOT}" && cd .. && mv "${LIVE_ROOT}"/*.iso ./ && rm -rf "${LIVE_ROOT}" ) || rm -rf "${LIVE_ROOT}"
- ( make-live -d unstable -o "debian-live-${CODENAME_UNSTABLE}-`dpkg --print-architecture`-${FLAVOUR}-" -p ${FLAVOUR} --with-source && cd "${LIVE_ROOT}" && cd .. && mv "${LIVE_ROOT}"/*.iso ./ && rm -rf "${LIVE_ROOT}" ) || rm -rf "${LIVE_ROOT}"
- done
- fi
-
# Building live system
Bootstrap
Chroot
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index 83101fc48..e762145a8 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -86,13 +86,7 @@ Defaults ()
;;
amd64)
- if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \
- [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ]
- then
- LIVE_KERNEL="amd64"
- else
- LIVE_KERNEL="amd64-generic"
- fi
+ LIVE_KERNEL="amd64"
;;
arm)
@@ -166,6 +160,21 @@ Defaults ()
LIVE_MIRROR_SECURITY="http://security.debian.org/"
fi
+ # Set default aptitude tasks
+ if [ "${LIVE_PACKAGE_LIST}" = "gnome-desktop" ]
+ then
+ LIVE_PACKAGE_LIST="gnome"
+ LIVE_TASKS="${LIVE_TASKS} gnome-desktop"
+ elif [ "${LIVE_PACKAGE_LIST}" = "kde-desktop" ]
+ then
+ LIVE_PACKAGE_LIST="kde"
+ LIVE_TASKS="${LIVE_TASKS} kde-desktop"
+ elif [ "${LIVE_PACKAGE_LIST}" = "xfce-desktop" ]
+ then
+ LIVE_PACKAGE_LIST="xfce"
+ LIVE_TASKS="${LIVE_TASKS} xfce-desktop"
+ fi
+
# Check for package lists
if [ -z "${LIVE_PACKAGE_LIST}" ]
then
diff --git a/src/scripts/14chroot.sh b/src/scripts/13chroot.sh
index 125f08f9f..06df0b60e 100644
--- a/src/scripts/14chroot.sh
+++ b/src/scripts/13chroot.sh
@@ -121,7 +121,7 @@ EOF
fi
# Restore cloned package selection
- if [ -f "${LIVE_PACAKGE_LIST_CLONED}" ]
+ if [ -f "${LIVE_PACKAGE_LIST_CLONED}" ]
then
Chroot_exec "xargs --arg-file=/root/`basename ${LIVE_PACKAGE_LIST_CLONED}` aptitude install --assume-yes"
fi
@@ -140,6 +140,15 @@ EOF
Chroot_exec "aptitude install --assume-yes ${LIVE_PACKAGES}"
fi
+ # Install aptitude tasks
+ if [ -n "${LIVE_TASKS}" ]
+ then
+ for TASK in ${LIVE_TASKS}
+ do
+ Chroot_exec "aptitude install --assume-yes ${TASK}"
+ done
+ fi
+
# Copy external directory into the chroot
if [ -d "${LIVE_INCLUDE_CHROOT}" ]
then
@@ -166,8 +175,8 @@ EOF
LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" Chroot_exec "${LIVE_HOOK}"
fi
- # Temporary hacks for broken packages
- Hack_xorg
+ # Save package list
+ Chroot_exec "dpkg --get-selections" > "${LIVE_ROOT}"/packages.txt
# Add filesystem.manifest
Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest
diff --git a/src/scripts/13hack.sh b/src/scripts/13hack.sh
deleted file mode 100644
index 1f7b57a58..000000000
--- a/src/scripts/13hack.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# make-live - utility to build Debian Live systems
-#
-# Copyright (C) 2006 Daniel Baumann <daniel@debian.org>
-# Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>
-#
-# make-live comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-Hack_xorg ()
-{
- # xserver-xorg << 7.1
- if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ]
- then
- if [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ]
- then
- # Comment "BusID" line and set driver to "vesa"
- sed -i -e 's/\(^.*BusID.*\)/#\1/g' -e '/Section "Device"/,/EndSection/ s/\(.*Driver.*"\).*\(".*\)/\1vesa\2/g' "${LIVE_CHROOT}"/etc/X11/xorg.conf
- fi
- fi
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 03:46:05 +0000