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

[molecules/arm-base] fixup remaster_post code, don't mess with /proc

Browse Source
This commit is contained in:
Fabio Erculiani 2012-01-31 21:25:05 +01:00
parent fc0aeb88d4
commit 755d5888d3
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
molecules/arm-base.common
View File

@ -24,7 +24,7 @@ outer_source_chroot_script: /sabayon/scripts/remaster_pre.sh
# IMAGE_NAME = name of the final MMC image
# DESTINATION_IMAGE_DIR = path to the destination image directory
# CHROOT_DIR = path pointing to the chroot
outer_source_chroot_script_after: /sabayon/scripts/remaster_post.sh
outer_source_chroot_script_after: /sabayon/scripts/mmc_remaster_post.sh
# Error script command, executed when something went wrong and molecule has
# to terminate the execution

13
scripts/mmc_remaster_post.sh Executable file
View File

@ -0,0 +1,13 @@
#!/bin/sh
PKGS_DIR="/sabayon/pkgcache"
CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/client/packages"
# remove entropy hwash
rm -f "${CHROOT_DIR}"/etc/entropy/.hw.hash
# remove entropy pid file
rm -f "${CHROOT_DIR}"/var/run/entropy/entropy.lock
echo "Umounting bind to ${CHROOT_PKGS_DIR}"
umount "${CHROOT_PKGS_DIR}" || exit 1
exit 0

5
scripts/remaster_pre.sh
View File

@ -10,6 +10,9 @@ rm -rf "${CHROOT_PKGS_DIR}"/*
echo "Mounting bind to ${CHROOT_PKGS_DIR}"
mount --bind "${PKGS_DIR}" "${CHROOT_PKGS_DIR}" || exit 1
mount -t proc proc "${CHROOT_DIR}/proc"
content=$(ls -1 "${CHROOT_DIR}/proc" | wc -l)
if [ "${content}" -le 3 ]; then
mount -t proc proc "${CHROOT_DIR}/proc"
fi
exit 0