From daa8f0d0f99aca48fa4dbd6f7616bf6ca37af7c2 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 23 Sep 2010 20:23:41 +0200 Subject: [PATCH] [scripts] mount /proc in remaster_pre and umount in remaster_post This avoids `find` to complain about Bad File Descriptor --- scripts/remaster_post.sh | 7 +++++++ scripts/remaster_pre.sh | 3 +++ 2 files changed, 10 insertions(+) diff --git a/scripts/remaster_post.sh b/scripts/remaster_post.sh index 192b2b9..06a523b 100755 --- a/scripts/remaster_post.sh +++ b/scripts/remaster_post.sh @@ -2,6 +2,13 @@ PKGS_DIR="/sabayon/pkgcache" CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/client/packages" +# make sure to not leak /proc +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}/* + +exit 0 diff --git a/scripts/remaster_pre.sh b/scripts/remaster_pre.sh index 564266f..66c86cc 100755 --- a/scripts/remaster_pre.sh +++ b/scripts/remaster_pre.sh @@ -8,4 +8,7 @@ CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/client/packages" echo "Mounting packages over" rm -rf "${CHROOT_PKGS_DIR}"/* cp ${PKGS_DIR}/* "${CHROOT_PKGS_DIR}"/ -Ra + +mount -t proc proc "${CHROOT_DIR}/proc" + exit 0