From 5f5b8b42e57b822c4b63f1f7b0d29324920e0e16 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 5 Sep 2012 13:52:06 +0200 Subject: [PATCH] [scripts] only touch /lib/rc/init.d/softlevel if parent dir exists --- scripts/amazon_ebs_image_inner_chroot_script_after.sh | 2 +- scripts/image_generic_inner_chroot_script_after.sh | 2 +- scripts/inner_chroot_script.sh | 2 +- scripts/mkloopcard_beagleboard_xm_chroot_hook.sh | 2 +- scripts/mkloopcard_beaglebone_chroot_hook.sh | 2 +- scripts/mkloopcard_efikamx_chroot_hook.sh | 2 +- scripts/remaster_generic_inner_chroot_script_after.sh | 2 +- scripts/remaster_serverbase_inner_chroot_script_after.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/amazon_ebs_image_inner_chroot_script_after.sh b/scripts/amazon_ebs_image_inner_chroot_script_after.sh index 3f4eed6..791a018 100755 --- a/scripts/amazon_ebs_image_inner_chroot_script_after.sh +++ b/scripts/amazon_ebs_image_inner_chroot_script_after.sh @@ -90,7 +90,7 @@ rm /var/lib/entropy/logs -rf rm -rf /install-data # Generate openrc cache -touch /lib/rc/init.d/softlevel +[[ -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 diff --git a/scripts/image_generic_inner_chroot_script_after.sh b/scripts/image_generic_inner_chroot_script_after.sh index d8ba1e8..b30681b 100755 --- a/scripts/image_generic_inner_chroot_script_after.sh +++ b/scripts/image_generic_inner_chroot_script_after.sh @@ -76,7 +76,7 @@ done rm /var/lib/entropy/logs -rf # Generate openrc cache -touch /lib/rc/init.d/softlevel +[[ -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 diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh index 1f10cb7..a54591b 100755 --- a/scripts/inner_chroot_script.sh +++ b/scripts/inner_chroot_script.sh @@ -77,7 +77,7 @@ echo "Vacuum cleaning client db" equo rescue vacuum # Generate openrc cache -touch /lib/rc/init.d/softlevel +[[ -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 diff --git a/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh b/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh index d097659..82de097 100755 --- a/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh +++ b/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh @@ -60,7 +60,7 @@ setup_startup_caches() { mount -t proc proc /proc /lib/rc/bin/rc-depend -u # Generate openrc cache - touch /lib/rc/init.d/softlevel + [[ -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 diff --git a/scripts/mkloopcard_beaglebone_chroot_hook.sh b/scripts/mkloopcard_beaglebone_chroot_hook.sh index 8b43420..7163197 100755 --- a/scripts/mkloopcard_beaglebone_chroot_hook.sh +++ b/scripts/mkloopcard_beaglebone_chroot_hook.sh @@ -41,7 +41,7 @@ setup_startup_caches() { mount -t proc proc /proc /lib/rc/bin/rc-depend -u # Generate openrc cache - touch /lib/rc/init.d/softlevel + [[ -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 diff --git a/scripts/mkloopcard_efikamx_chroot_hook.sh b/scripts/mkloopcard_efikamx_chroot_hook.sh index ec56b3a..fd4ba67 100755 --- a/scripts/mkloopcard_efikamx_chroot_hook.sh +++ b/scripts/mkloopcard_efikamx_chroot_hook.sh @@ -60,7 +60,7 @@ setup_startup_caches() { mount -t proc proc /proc /lib/rc/bin/rc-depend -u # Generate openrc cache - touch /lib/rc/init.d/softlevel + [[ -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 diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh index 0c0f343..bf767a3 100755 --- a/scripts/remaster_generic_inner_chroot_script_after.sh +++ b/scripts/remaster_generic_inner_chroot_script_after.sh @@ -269,7 +269,7 @@ setup_portage() { setup_startup_caches() { /lib/rc/bin/rc-depend -u # Generate openrc cache - touch /lib/rc/init.d/softlevel + [[ -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 diff --git a/scripts/remaster_serverbase_inner_chroot_script_after.sh b/scripts/remaster_serverbase_inner_chroot_script_after.sh index e445740..98f76e1 100755 --- a/scripts/remaster_serverbase_inner_chroot_script_after.sh +++ b/scripts/remaster_serverbase_inner_chroot_script_after.sh @@ -16,7 +16,7 @@ rm -rf /install-data /lib/rc/bin/rc-depend -u # Generate openrc cache -touch /lib/rc/init.d/softlevel +[[ -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