diff --git a/scripts/amazon_ebs_image_inner_chroot_script_after.sh b/scripts/amazon_ebs_image_inner_chroot_script_after.sh index d41ae3e..0360292 100755 --- a/scripts/amazon_ebs_image_inner_chroot_script_after.sh +++ b/scripts/amazon_ebs_image_inner_chroot_script_after.sh @@ -79,8 +79,6 @@ initrd /boot/Initrd # Generate list of installed packages equo query list installed -qv > /etc/sabayon-pkglist -/lib/rc/bin/rc-depend -u - echo "Vacuum cleaning client db" rm /var/lib/entropy/client/database/*/sabayonlinux.org -rf rm /var/lib/entropy/client/database/*/sabayon-weekly -rf @@ -98,12 +96,6 @@ rm /var/lib/entropy/logs -rf # cleanup install-data dir rm -rf /install-data -# Generate openrc cache -[[ -d "/lib/rc/init.d" ]] && touch /lib/rc/init.d/softlevel -[[ -d "/run/openrc" ]] && touch /run/openrc/softlevel -/etc/init.d/savecache start -/etc/init.d/savecache zap - ldconfig ldconfig umount /proc diff --git a/scripts/image_generic_inner_chroot_script_after.sh b/scripts/image_generic_inner_chroot_script_after.sh index 2113063..6cf6189 100755 --- a/scripts/image_generic_inner_chroot_script_after.sh +++ b/scripts/image_generic_inner_chroot_script_after.sh @@ -65,8 +65,6 @@ kernel ${kernel_bin} root=/dev/sda1 # Generate list of installed packages equo query list installed -qv > /etc/sabayon-pkglist -/lib/rc/bin/rc-depend -u - echo "Vacuum cleaning client db" rm /var/lib/entropy/client/database/*/sabayonlinux.org -rf rm /var/lib/entropy/client/database/*/sabayon-weekly -rf @@ -82,12 +80,6 @@ done # cleanup log dir rm /var/lib/entropy/logs -rf -# Generate openrc cache -[[ -d "/lib/rc/init.d" ]] && touch /lib/rc/init.d/softlevel -[[ -d "/run/openrc" ]] && touch /run/openrc/softlevel -/etc/init.d/savecache start -/etc/init.d/savecache zap - ldconfig ldconfig umount /proc diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh index 50974ca..248b6b5 100755 --- a/scripts/inner_chroot_script.sh +++ b/scripts/inner_chroot_script.sh @@ -119,17 +119,10 @@ update-usbids echo -5 | etc-update mount -t proc proc /proc -/lib/rc/bin/rc-depend -u echo "Vacuum cleaning client db" equo rescue vacuum -# Generate openrc cache -[[ -d "/lib/rc/init.d" ]] && touch /lib/rc/init.d/softlevel -[[ -d "/run/openrc" ]] && touch /run/openrc/softlevel -/etc/init.d/savecache start -/etc/init.d/savecache zap - ldconfig ldconfig umount /proc diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh index b7774ba..7a868b8 100755 --- a/scripts/remaster_generic_inner_chroot_script_after.sh +++ b/scripts/remaster_generic_inner_chroot_script_after.sh @@ -309,13 +309,6 @@ setup_portage() { } setup_startup_caches() { - /lib/rc/bin/rc-depend -u - # Generate openrc cache - [[ -d "/lib/rc/init.d" ]] && touch /lib/rc/init.d/softlevel - [[ -d "/run/openrc" ]] && touch /run/openrc/softlevel - /etc/init.d/savecache start - /etc/init.d/savecache zap - ldconfig ldconfig } diff --git a/scripts/remaster_serverbase_inner_chroot_script_after.sh b/scripts/remaster_serverbase_inner_chroot_script_after.sh index 272cd36..7d51382 100755 --- a/scripts/remaster_serverbase_inner_chroot_script_after.sh +++ b/scripts/remaster_serverbase_inner_chroot_script_after.sh @@ -19,15 +19,6 @@ sd_disable avahi-daemon # install-data dir is really not needed rm -rf /install-data -/lib/rc/bin/rc-depend -u - -# Generate openrc cache -[[ -d "/lib/rc/init.d" ]] && touch /lib/rc/init.d/softlevel -[[ -d "/run/openrc" ]] && touch /run/openrc/softlevel -/etc/init.d/savecache start -/etc/init.d/savecache zap - -ldconfig ldconfig emaint --fix world