summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/config8
-rwxr-xr-xsrc/main.sh2
-rw-r--r--src/scripts/02defaults.sh4
-rw-r--r--src/scripts/12patch.sh24
-rw-r--r--src/scripts/13hack.sh19
-rw-r--r--src/scripts/14chroot.sh (renamed from src/scripts/13chroot.sh)24
-rw-r--r--src/scripts/21image.sh48
-rw-r--r--src/scripts/22iso.sh6
-rw-r--r--src/scripts/23net.sh8
9 files changed, 117 insertions, 26 deletions
diff --git a/src/config b/src/config
index b4f32b2..01b1c81 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 2d8fda9..b0405e0 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 9a0342d..99a8d3b 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 16be344..873865c 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 <<EOF
+#!/bin/sh
+
+exit 101
+EOF
+
+ chmod 0755 "${LIVE_CHROOT}"/usr/sbin/policy-rc.d
+ ;;
+
+ deapply)
+ # Removing init policy
+ rm -f "${LIVE_CHROOT}"/usr/sbin/policy-rc.d
+ ;;
+ esac
+}
+
Patch_network ()
{
# Packages which are manually installed inside the chroot are installed
diff --git a/src/scripts/13hack.sh b/src/scripts/13hack.sh
new file mode 100644
index 0000000..74bb5ad
--- /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 <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 ()
+{
+ 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/13chroot.sh b/src/scripts/14chroot.sh
index dd177df..5f3ff9c 100644
--- a/src/scripts/13chroot.sh
+++ b/src/scripts/14chroot.sh
@@ -21,29 +21,13 @@ Chroot ()
then
# Configure chroot
Patch_chroot apply
+ #Patch_runlevel 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"
+ Indices custom
# Install secure apt
if [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ]
@@ -92,6 +76,9 @@ Chroot ()
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
@@ -106,6 +93,7 @@ Chroot ()
Patch_network deapply
# Deconfigure chroot
+ #Patch_runlevel deapply
Patch_chroot deapply
# Touching stage file
diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh
index 51be0a1..0f483a6 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 bb67ef9..8f5b8c2 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 816d05a..1441183 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
generated by cgit v1.0 at 2024-11-23 01:31:15 +0000