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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
molecules/3rdparty/mcs.common vendored
View File

@ -27,8 +27,8 @@ inner_chroot_script_after: /sabayon/scripts/3rdparty/remaster_mcs_inner_chroot_s
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/remaster_post.sh outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
# Used to umount /proc # Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/3rdparty/error_script_mcs.sh error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat

3
molecules/corecdx.common
View File

@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/remaster_post.sh outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
# Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat

3
molecules/e17.common
View File

@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/remaster_post.sh outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
# Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat

3
molecules/gaming.common
View File

@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_gaming_inner_chroot_script_
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/gaming_remaster_post.sh outer_chroot_script_after: /sabayon/scripts/gaming_remaster_post.sh
# Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
# IMPORTANT NOTE: -allow-limited-size is only supported by cdrkit provided mkisofs. # IMPORTANT NOTE: -allow-limited-size is only supported by cdrkit provided mkisofs.
# Please use cdrkit to make this molecule working !!! Or drop some games and remove the switch. # Please use cdrkit to make this molecule working !!! Or drop some games and remove the switch.

3
molecules/gnome.common
View File

@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/remaster_post.sh outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
# Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat

3
molecules/kde.common
View File

@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/remaster_post.sh outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
# Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat

3
molecules/lxde.common
View File

@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/remaster_post.sh outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
# Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat

3
molecules/sabayon-x86-gforensic.spec
View File

@ -46,6 +46,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/gforensic_remaster_post.sh outer_chroot_script_after: /sabayon/scripts/gforensic_remaster_post.sh
# Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat

3
molecules/serverbase.common
View File

@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_nox_inner_chroot_script_aft
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/remaster_post.sh outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
# Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat

3
molecules/xfce.common
View File

@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/remaster_post.sh outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
# Used to umount /proc and unbind packages dir
error_script: /sabayon/scripts/remaster_error_script.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat

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
umount "${CHROOT_DIR}/proc" &> /dev/null umount "${CHROOT_DIR}/proc" &> /dev/null
echo "Merging back packages" echo "Umounting bind to ${CHROOT_PKGS_DIR}"
cp "${CHROOT_PKGS_DIR}"/* "${PKGS_DIR}"/ -Ra umount "${CHROOT_PKGS_DIR}" || exit 1
rm -rf "${CHROOT_PKGS_DIR}"{,-nonfree,-restricted}/*
exit 0 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 "${PKGS_DIR}" ]] && mkdir -p "${PKGS_DIR}"
[[ ! -d "${CHROOT_PKGS_DIR}" ]] && mkdir -p "${CHROOT_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}"/* 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" mount -t proc proc "${CHROOT_DIR}/proc"