diff options
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/02defaults.sh | 23 | ||||
| -rw-r--r-- | src/scripts/13chroot.sh (renamed from src/scripts/14chroot.sh) | 15 | ||||
| -rw-r--r-- | src/scripts/13hack.sh | 23 |
3 files changed, 28 insertions, 33 deletions
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index 83101fc..e762145 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 125f08f..06df0b6 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 1f7b57a..0000000 --- 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 -} |