summaryrefslogtreecommitdiff
path: root/src/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripts')
-rw-r--r--src/scripts/02defaults.sh12
-rw-r--r--src/scripts/14chroot.sh18
-rw-r--r--src/scripts/21image.sh14
3 files changed, 40 insertions, 4 deletions
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index faca476..aa26f76 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -154,6 +154,12 @@ Defaults ()
LIVE_MIRROR="http://ftp.debian.org/debian/"
fi
+ # Set debian keyring
+ if [ -z "${LIVE_REPOSITORY_KEYRING}" ]
+ then
+ LIVE_REPOSITORY_KEYRING="debian-archive-keyring"
+ fi
+
# Set debian security mirror
if [ -z "${LIVE_MIRROR_SECURITY}" ]
then
@@ -248,4 +254,10 @@ Defaults ()
then
LIVE_SOURCE="no"
fi
+
+ # Set disk volume
+ if [ -z "${LIVE_DISK_VOLUME}" ]
+ then
+ LIVE_DISK_VOLUME="Debian Live `date +%Y%m%d`"
+ fi
}
diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh
index 2e2b489..5132e8c 100644
--- a/src/scripts/14chroot.sh
+++ b/src/scripts/14chroot.sh
@@ -30,6 +30,16 @@ Chroot ()
# Mount proc
mount proc-live -t proc "${LIVE_CHROOT}"/proc
+ # Avoid daemon starting
+ cat > "${LIVE_CHROOT}"/usr/sbin/policy-rc.d <<EOF
+#!/bin/sh
+echo
+echo "Warning: invoke-rc.d policy in action. Skiping daemon starting"
+
+exit 101
+EOF
+ chmod 755 "${LIVE_CHROOT}"/usr/sbin/policy-rc.d
+
# Configure sources.list
Indices custom initial
@@ -42,7 +52,7 @@ Chroot ()
then
if [ "${LIVE_FLAVOUR}" != "minimal" ]
then
- Chroot_exec "aptitude install --assume-yes debian-archive-keyring"
+ Chroot_exec "apt-get install --yes --force-yes ${LIVE_REPOSITORY_KEYRING}"
for NAME in ${LIVE_REPOSITORIES}
do
@@ -172,9 +182,15 @@ Chroot ()
rm -rf "${LIVE_CHROOT}"/var/cache/apt
mkdir -p "${LIVE_CHROOT}"/var/cache/apt/archives/partial
+ # Workaround binfmt-support /proc locking
+ umount "${LIVE_CHROOT}"/proc/sys/fs/binfmt_misc > /dev/null || true
+
# Unmount proc
umount "${LIVE_CHROOT}"/proc
+ # Allow daemon starting
+ rm "${LIVE_CHROOT}"/usr/sbin/policy-rc.d
+
# Deconfigure network
Patch_network deapply
diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh
index d44d4f3..ba52d70 100644
--- a/src/scripts/21image.sh
+++ b/src/scripts/21image.sh
@@ -181,6 +181,10 @@ Syslinux ()
"${LIVE_ROOT}"/binary/isolinux
rm -f "${LIVE_ROOT}"/binary/isolinux/pxelinux.cfg
+ if [ -n "${LIVE_ISOLINUX_SPLASH}" ]; then
+ cp "${LIVE_ISOLINUX_SPLASH}" "${LIVE_ROOT}/binary/isolinux/splash.rle"
+ fi
+
# Configure syslinux templates
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${LIVE_ROOT}"/binary/isolinux/isolinux.cfg
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${LIVE_ROOT}"/binary/isolinux/f1.txt
@@ -200,6 +204,10 @@ Syslinux ()
rm -f "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/isolinux.cfg
sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/isolinux.txt
+ if [ -n "${LIVE_ISOLINUX_SPLASH}" ]; then
+ cp "${LIVE_ISOLINUX_SPLASH}" "${LIVE_ROOT}/tftpboot/pxelinux.cfg/splash.rle"
+ fi
+
# Configure syslinux templates
sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/default
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/f1.txt
@@ -296,19 +304,19 @@ Mkisofs ()
if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
then
# Create image
- mkisofs -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_ROOT}"/"${LIVE_IMAGE}"binary.iso -r -J -l -V "Debian Live `date +%Y%m%d`" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${LIVE_ROOT}"/binary ${LIVE_INCLUDE_IMAGE}
+ genisoimage -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_ROOT}"/"${LIVE_IMAGE}"binary.iso -r -J -l -V "${LIVE_DISK_VOLUME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${LIVE_ROOT}"/binary ${LIVE_INCLUDE_IMAGE}
else
echo "W: Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
sleep 5
# Create image
- mkisofs -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_ROOT}"/"${LIVE_IMAGE}"binary.iso -r -J -l -V "Debian Live `date +%Y%m%d`" "${LIVE_ROOT}"/binary ${LIVE_INCLUDE_IMAGE}
+ genisoimage -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_ROOT}"/"${LIVE_IMAGE}"binary.iso -r -J -l -V "${LIVE_DISK_VOLUME}" "${LIVE_ROOT}"/binary ${LIVE_INCLUDE_IMAGE}
fi
;;
source)
# Create image
- mkisofs -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_ROOT}"/"${LIVE_IMAGE}"source.iso -r -J -l -V "Debian Live `date +%Y%m%d`" "${LIVE_ROOT}"/source
+ genisoimage -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o "${LIVE_ROOT}"/"${LIVE_IMAGE}"source.iso -r -J -l -V "${LIVE_DISK_VOLUME}" "${LIVE_ROOT}"/source
;;
esac
}
generated by cgit v1.0 at 2024-11-16 19:23:13 +0000