sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[remaster/*] use mount --bind trick instead of cp to copy packages cache over to chroots

Browse Source
This commit is contained in:
Fabio Erculiani
2010-12-21 18:52:58 +01:00
parent c10f142fcc
commit 83b05d6ee8
14 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/3rdparty/error_script_mcs.sh vendored
View File

@@ -1,4 +0,0 @@
#!/bin/sh
if [ -d "${CHROOT_DIR}" ]; then
umount "${CHROOT_DIR}/proc"
fi

7
scripts/remaster_error_script.sh Executable file
View File

@@ -0,0 +1,7 @@
#!/bin/sh
if [ -d "${CHROOT_DIR}" ]; then
umount "${CHROOT_DIR}/proc"
fi
echo "Umounting bind to ${CHROOT_PKGS_DIR}"
umount "${CHROOT_PKGS_DIR}" || exit 1

5
scripts/remaster_post.sh
View File

@@ -7,8 +7,7 @@ umount "${CHROOT_DIR}/proc" &> /dev/null
umount "${CHROOT_DIR}/proc" &> /dev/null
umount "${CHROOT_DIR}/proc" &> /dev/null
echo "Merging back packages"
cp "${CHROOT_PKGS_DIR}"/* "${PKGS_DIR}"/ -Ra
rm -rf "${CHROOT_PKGS_DIR}"{,-nonfree,-restricted}/*
echo "Umounting bind to ${CHROOT_PKGS_DIR}"
umount "${CHROOT_PKGS_DIR}" || exit 1
exit 0

5
scripts/remaster_pre.sh
View File

@@ -5,9 +5,10 @@ CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/client/packages"
[[ ! -d "${PKGS_DIR}" ]] && mkdir -p "${PKGS_DIR}"
[[ ! -d "${CHROOT_PKGS_DIR}" ]] && mkdir -p "${CHROOT_PKGS_DIR}"
echo "Mounting packages over"
# make sure it's all clean before mounting
rm -rf "${CHROOT_PKGS_DIR}"/*
cp ${PKGS_DIR}/* "${CHROOT_PKGS_DIR}"/ -Ra
echo "Mounting bind to ${CHROOT_PKGS_DIR}"
mount --bind "${PKGS_DIR}" "${CHROOT_PKGS_DIR}" || exit 1
mount -t proc proc "${CHROOT_DIR}/proc"