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

molecules/3rdparty/mcs.common

@@ -27,8 +27,8 @@ inner_chroot_script_after: /sabayon/scripts/3rdparty/remaster_mcs_inner_chroot_s
 # before entering it (and AFTER inner_chroot_script)
 outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
 
-# Used to umount /proc
-error_script: /sabayon/scripts/3rdparty/error_script_mcs.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: -b isolinux/isolinux.bin -c isolinux/boot.cat

molecules/corecdx.common

@@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
 # before entering it (and AFTER inner_chroot_script)
 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: -b isolinux/isolinux.bin -c isolinux/boot.cat
 

molecules/e17.common

@@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
 # before entering it (and AFTER inner_chroot_script)
 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: -b isolinux/isolinux.bin -c isolinux/boot.cat
 

molecules/gaming.common

@@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_gaming_inner_chroot_script_
 # before entering it (and AFTER inner_chroot_script)
 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
 # 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.

molecules/gnome.common

@@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
 # before entering it (and AFTER inner_chroot_script)
 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: -b isolinux/isolinux.bin -c isolinux/boot.cat
 

molecules/kde.common

@@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
 # before entering it (and AFTER inner_chroot_script)
 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: -b isolinux/isolinux.bin -c isolinux/boot.cat
 

molecules/lxde.common

@@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
 # before entering it (and AFTER inner_chroot_script)
 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: -b isolinux/isolinux.bin -c isolinux/boot.cat
 

molecules/sabayon-x86-gforensic.spec

@@ -46,6 +46,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
 # before entering it (and AFTER inner_chroot_script)
 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: -b isolinux/isolinux.bin -c isolinux/boot.cat
 

molecules/serverbase.common

@@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_nox_inner_chroot_script_aft
 # before entering it (and AFTER inner_chroot_script)
 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: -b isolinux/isolinux.bin -c isolinux/boot.cat
 

molecules/xfce.common

@@ -26,6 +26,9 @@ inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script
 # before entering it (and AFTER inner_chroot_script)
 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: -b isolinux/isolinux.bin -c isolinux/boot.cat
 

scripts/3rdparty/error_script_mcs.sh

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

scripts/remaster_error_script.sh

@@ -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

scripts/remaster_post.sh

@@ -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

scripts/remaster_pre.sh

@@ -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"