From c9462fd48b0d4fb9968641e46c3350fb5e9986a2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 10:04:21 +0200 Subject: Adding live-package 0.99.4-1. --- src/config | 8 ++-- src/main.sh | 2 +- src/scripts/02defaults.sh | 4 +- src/scripts/12patch.sh | 24 ++++++++++ src/scripts/13chroot.sh | 116 ---------------------------------------------- src/scripts/13hack.sh | 19 ++++++++ src/scripts/14chroot.sh | 104 +++++++++++++++++++++++++++++++++++++++++ src/scripts/21image.sh | 48 +++++++++++++++++++ src/scripts/22iso.sh | 6 +++ src/scripts/23net.sh | 8 +++- 10 files changed, 215 insertions(+), 124 deletions(-) delete mode 100644 src/scripts/13chroot.sh create mode 100644 src/scripts/13hack.sh create mode 100644 src/scripts/14chroot.sh (limited to 'src') diff --git a/src/config b/src/config index b4f32b2e5..01b1c81c4 100644 --- a/src/config +++ b/src/config @@ -42,11 +42,11 @@ # Kernel flavour (Default: auto-detected) #LIVE_KERNEL="" -# Debian mirror (Default: http://ftp.debian.org/debian) -#LIVE_MIRROR="http://ftp.debian.org/debian" +# Debian mirror (Default: http://ftp.debian.org/debian/) +#LIVE_MIRROR="http://ftp.debian.org/debian/" -# Debian security mirror (Default: http://security.debian.org/debian) -#LIVE_MIRROR_SECURITY="http://ftp.debian.org/debian-security" +# Debian security mirror (Default: http://security.debian.org/) +#LIVE_MIRROR_SECURITY="http://security.debian.org/" # Packages (Default: empty) LIVE_PACKAGES="cdebootstrap less locales screen sudo vim" diff --git a/src/main.sh b/src/main.sh index 2d8fda95a..b0405e039 100755 --- a/src/main.sh +++ b/src/main.sh @@ -28,7 +28,7 @@ set -e BASE="/usr/share/make-live" CONFIG="/etc/make-live.conf" PROGRAM="`basename ${0}`" -VERSION="0.99.3" +VERSION="0.99.4" CODENAME_OLDSTABLE="woody" CODENAME_STABLE="sarge" diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index 9a0342da3..99a8d3b4a 100644 --- a/src/scripts/02defaults.sh +++ b/src/scripts/02defaults.sh @@ -136,13 +136,13 @@ Defaults () # Set debian mirror if [ -z "${LIVE_MIRROR}" ] then - LIVE_MIRROR="http://ftp.debian.org/debian" + LIVE_MIRROR="http://ftp.debian.org/debian/" fi # Set debian security mirror if [ -z "${LIVE_MIRROR_SECURITY}" ] then - LIVE_MIRROR_SECURITY="http://security.debian.org/debian" + LIVE_MIRROR_SECURITY="http://security.debian.org/" fi # Set debian sections diff --git a/src/scripts/12patch.sh b/src/scripts/12patch.sh index 16be344f1..873865c36 100644 --- a/src/scripts/12patch.sh +++ b/src/scripts/12patch.sh @@ -27,6 +27,30 @@ Patch_chroot () esac } +Patch_runlevel () +{ + # Disabling all init scripts with a blocking policy as in + # /usr/share/doc/sysv-rc/README.policy-rc.d.gz. + + case "${1}" in + apply) + # Create init policy + echo > "${LIVE_CHROOT}"/usr/sbin/policy-rc.d < -# Copyright (C) 2006 Marco Amadori -# -# 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. - -Chroot_exec () -{ - # Execute commands chrooted - chroot "${LIVE_CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LIVE_PROXY_FTP}" http_proxy="${LIVE_PPROXY_HTTP}" DEBIAN_FRONTEND="noninteractive" DEBIAN_PRIORITY="critical" ${1} -} - -Chroot () -{ - if [ ! -f "${LIVE_ROOT}"/.stage/chroot ] - then - # Configure chroot - Patch_chroot apply - - # Configure network - Patch_network apply - - # Configure sources.list - echo "deb ${LIVE_MIRROR} ${LIVE_DISTRIBUTION} ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list - - case "${LIVE_DISTRIBUTION}" in - "${CODENAME_TESTING}") - echo "deb ${LIVE_MIRROR} ${CODENAME_TESTING}-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list - echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_TESTING}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list - ;; - - "${CODENAME_STABLE}") - echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_STABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list - ;; - - "${CODENAME_OLDSTABLE}") - echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_OLDSTABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list - ;; - esac - - Chroot_exec "apt-get update" - - # Install secure apt - if [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] - then - Chroot_exec "apt-get install --yes --force-yes debian-archive-keyring" - fi - - # Update indices - Chroot_exec "apt-get update" - - # Configure linux-image - Patch_linux apply - - # Install linux-image, modules and casper - Chroot_exec "apt-get install --yes linux-image-2.6-${LIVE_KERNEL} squashfs-modules-2.6-${LIVE_KERNEL} unionfs-modules-2.6-${LIVE_KERNEL} casper" - - # Rebuild initial ramdisk - Chroot_exec "dpkg-reconfigure `basename ${LIVE_CHROOT}/var/lib/dpkg/info/linux-image-2.6.*-${LIVE_KERNEL}.postinst .postinst`" - - # Deconfigure linux-image - Patch_linux deapply - - # Install packages list - if [ -n "${LIVE_PACKAGE_LIST}" ] - then - Chroot_exec "apt-get install --yes `cat ${LIVE_PACKAGE_LIST}`" - fi - - # Install extra packages - if [ -n "${LIVE_PACKAGES}" ] - then - Chroot_exec "apt-get install --yes ${LIVE_PACKAGES}" - fi - - # Copy external directory into the chroot - if [ -d "${LIVE_INCLUDE_CHROOT}" ] - then - cd "${LIVE_INCLUDE_CHROOT}" - find . | cpio -pumd "${LIVE_CHROOT}" - cd "${OLDPWD}" - fi - - # Execute extra command in the chroot - if [ -n "${LIVE_HOOK}" ] - then - Chroot_exec "${LIVE_HOOK}" - fi - - # Clean apt packages cache - rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb - rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/partial/*.deb - - # Clean apt indices cache - rm -f "${LIVE_CHROOT}"/var/cache/apt/*pkgcache.bin - - # Remove cdebootstrap packages cache - rm -rf "${LIVE_CHROOT}"/var/cache/bootstrap - - # Deconfigure network - Patch_network deapply - - # Deconfigure chroot - Patch_chroot deapply - - # Touching stage file - touch "${LIVE_ROOT}"/.stage/chroot - - echo "done." - fi -} diff --git a/src/scripts/13hack.sh b/src/scripts/13hack.sh new file mode 100644 index 000000000..74bb5adcd --- /dev/null +++ b/src/scripts/13hack.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +# make-live - utility to build Debian Live systems +# +# Copyright (C) 2006 Daniel Baumann +# Copyright (C) 2006 Marco Amadori +# +# 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 () +{ + if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ] + 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 +} diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh new file mode 100644 index 000000000..5f3ff9cd6 --- /dev/null +++ b/src/scripts/14chroot.sh @@ -0,0 +1,104 @@ +#!/bin/sh + +# make-live - utility to build Debian Live systems +# +# Copyright (C) 2006 Daniel Baumann +# Copyright (C) 2006 Marco Amadori +# +# 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. + +Chroot_exec () +{ + # Execute commands chrooted + chroot "${LIVE_CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LIVE_PROXY_FTP}" http_proxy="${LIVE_PPROXY_HTTP}" DEBIAN_FRONTEND="noninteractive" DEBIAN_PRIORITY="critical" ${1} +} + +Chroot () +{ + if [ ! -f "${LIVE_ROOT}"/.stage/chroot ] + then + # Configure chroot + Patch_chroot apply + #Patch_runlevel apply + + # Configure network + Patch_network apply + + # Configure sources.list + Indices custom + + # Install secure apt + if [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] + then + Chroot_exec "apt-get install --yes --force-yes debian-archive-keyring" + fi + + # Update indices + Chroot_exec "apt-get update" + + # Configure linux-image + Patch_linux apply + + # Install linux-image, modules and casper + Chroot_exec "apt-get install --yes linux-image-2.6-${LIVE_KERNEL} squashfs-modules-2.6-${LIVE_KERNEL} unionfs-modules-2.6-${LIVE_KERNEL} casper" + + # Rebuild initial ramdisk + Chroot_exec "dpkg-reconfigure `basename ${LIVE_CHROOT}/var/lib/dpkg/info/linux-image-2.6.*-${LIVE_KERNEL}.postinst .postinst`" + + # Deconfigure linux-image + Patch_linux deapply + + # Install packages list + if [ -n "${LIVE_PACKAGE_LIST}" ] + then + Chroot_exec "apt-get install --yes `cat ${LIVE_PACKAGE_LIST}`" + fi + + # Install extra packages + if [ -n "${LIVE_PACKAGES}" ] + then + Chroot_exec "apt-get install --yes ${LIVE_PACKAGES}" + fi + + # Copy external directory into the chroot + if [ -d "${LIVE_INCLUDE_CHROOT}" ] + then + cd "${LIVE_INCLUDE_CHROOT}" + find . | cpio -pumd "${LIVE_CHROOT}" + cd "${OLDPWD}" + fi + + # Execute extra command in the chroot + if [ -n "${LIVE_HOOK}" ] + then + Chroot_exec "${LIVE_HOOK}" + fi + + # Temporary hacks for broken packages + Hack_xorg + + # Clean apt packages cache + rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb + rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/partial/*.deb + + # Clean apt indices cache + rm -f "${LIVE_CHROOT}"/var/cache/apt/*pkgcache.bin + + # Remove cdebootstrap packages cache + rm -rf "${LIVE_CHROOT}"/var/cache/bootstrap + + # Deconfigure network + Patch_network deapply + + # Deconfigure chroot + #Patch_runlevel deapply + Patch_chroot deapply + + # Touching stage file + touch "${LIVE_ROOT}"/.stage/chroot + + echo "done." + fi +} diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh index 51be0a106..0f483a6d3 100644 --- a/src/scripts/21image.sh +++ b/src/scripts/21image.sh @@ -9,6 +9,54 @@ # This is free software, and you are welcome to redistribute it # under certain conditions; see COPYING for details. +Indices () +{ + case "${1}" in + default) + # Configure default sources.list + echo "deb http://ftp.debian.org/debian/ ${LIVE_DISTRIBUTION} ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list + + case "${LIVE_DISTRIBUTION}" in + "${CODENAME_TESTING}") + echo "deb http://ftp.debian.org/debian/ ${CODENAME_TESTING}-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb http://security.debian.org/ ${CODENAME_TESTING}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + ;; + + "${CODENAME_STABLE}") + echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_STABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + ;; + + "${CODENAME_OLDSTABLE}") + echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_OLDSTABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + ;; + esac + ;; + + custom) + # Configure custom sources.list + echo "deb ${LIVE_MIRROR} ${LIVE_DISTRIBUTION} ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list + + case "${LIVE_DISTRIBUTION}" in + "${CODENAME_TESTING}") + echo "deb ${LIVE_MIRROR} ${CODENAME_TESTING}-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_TESTING}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + ;; + + "${CODENAME_STABLE}") + echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_STABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + ;; + + "${CODENAME_OLDSTABLE}") + echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_OLDSTABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + ;; + esac + ;; + esac + + # Update indices + Chroot_exec "apt-get update" +} + Md5sum () { # Calculating md5sums diff --git a/src/scripts/22iso.sh b/src/scripts/22iso.sh index bb67ef9b4..8f5b8c287 100644 --- a/src/scripts/22iso.sh +++ b/src/scripts/22iso.sh @@ -12,10 +12,16 @@ Iso () { mkdir -p "${LIVE_ROOT}"/image/casper + + # Switching package indices to default + Indices default # Generating rootfs image Genrootfs + # Switching package indices to custom + Indices custom + # Installing syslinux Syslinux iso diff --git a/src/scripts/23net.sh b/src/scripts/23net.sh index 816d05aa7..144118363 100644 --- a/src/scripts/23net.sh +++ b/src/scripts/23net.sh @@ -29,10 +29,16 @@ NFSROOT=auto EOF Chroot_exec "update-initramfs -tu" fi + + # Switching package indices to default + Indices default - # Generating rootfs + # Generating rootfs image Genrootfs + # Switching package indices to custom + Indices custom + # Installing syslinux Syslinux net -- cgit v1.2.3