summaryrefslogtreecommitdiff
path: root/src/scripts/14chroot.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:38 +0200
committerDaniel Baumann <daniel@debian.org>2007-09-23 10:04:38 +0200
commit16b3f9f04c720781692c68aa754ec249bb1c9d4d (patch)
tree64e1fbd60ca22ddd5d3bdafdda29862d2baade78 /src/scripts/14chroot.sh
parent3ca3713c66686896323a5bacd5f06d5ec7e00002 (diff)
downloadvyos-live-build-16b3f9f04c720781692c68aa754ec249bb1c9d4d.tar.gz
vyos-live-build-16b3f9f04c720781692c68aa754ec249bb1c9d4d.zip
Adding live-package 0.99.17-1.
Diffstat (limited to 'src/scripts/14chroot.sh')
-rw-r--r--src/scripts/14chroot.sh18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh
index 2e2b489f0..5132e8c76 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