From 64ba8b30526c38b45abee76eb1183e53c5f290b0 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 10 Jul 2011 11:30:23 +0200 Subject: [PATCH] [scripts] always remove hwhash cruft --- scripts/inner_chroot_script.sh | 3 +++ scripts/remaster_post_common.sh | 3 +++ scripts/tar_generic_inner_chroot_script_after.sh | 3 +++ 3 files changed, 9 insertions(+) diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh index 7583277..9c9bfaf 100755 --- a/scripts/inner_chroot_script.sh +++ b/scripts/inner_chroot_script.sh @@ -114,4 +114,7 @@ rm -rf /var/lib/entropy/logs rm -rf /var/lib/entropy/glsa rm -rf /var/lib/entropy/tmp +# remove entropy hwhash +rm -f /etc/entropy/.hw.hash + exit 0 diff --git a/scripts/remaster_post_common.sh b/scripts/remaster_post_common.sh index 67282d6..5a2e3ab 100755 --- a/scripts/remaster_post_common.sh +++ b/scripts/remaster_post_common.sh @@ -7,3 +7,6 @@ if [ -z "${BUILDING_DAILY}" ]; then sed -i "/^officialrepositoryid/ s/sabayonlinux.org/sabayon-weekly/" "${repo_conf}" || exit 1 sed -i "/^official-repository-id/ s/sabayonlinux.org/sabayon-weekly/" "${repo_conf}" || exit 1 fi + +# remove entropy hwash +rm -f "${CHROOT_DIR}"/etc/entropy/.hw.hash diff --git a/scripts/tar_generic_inner_chroot_script_after.sh b/scripts/tar_generic_inner_chroot_script_after.sh index 15ae783..a68a766 100755 --- a/scripts/tar_generic_inner_chroot_script_after.sh +++ b/scripts/tar_generic_inner_chroot_script_after.sh @@ -4,3 +4,6 @@ # Generate list of installed packages equo query list installed -qv > /etc/sabayon-pkglist + +# remove hw hash +rm -f /etc/entropy/.hw.hash