From 0c2e079c1050161852d728c31849eb9e67b46fad Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 13 Nov 2007 12:49:43 +0100 Subject: Outputting an own message when having more than one case in a helper, instead of a global one. --- helpers/lh_chroot_devpts | 6 ++++-- helpers/lh_chroot_dpkg | 4 ++-- helpers/lh_chroot_proc | 6 ++++-- helpers/lh_chroot_sysfs | 6 ++++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts index 07fec4d..7bb5e45 100755 --- a/helpers/lh_chroot_devpts +++ b/helpers/lh_chroot_devpts @@ -36,13 +36,13 @@ Read_conffile config/source Read_conffile "${LH_CONFIG}" Set_defaults -Echo_message "Begin mounting /dev/pts..." - # Requiring stage file Require_stagefile .stage/bootstrap case "${1}" in install) + Echo_message "Begin mounting /dev/pts..." + # Checking stage file Check_stagefile .stage/chroot_devpts @@ -66,6 +66,8 @@ case "${1}" in ;; remove) + Echo_message "Begin unmounting /dev/pts..." + # Checking lock file Check_lockfile .lock diff --git a/helpers/lh_chroot_dpkg b/helpers/lh_chroot_dpkg index ae08f8a..a34e97e 100755 --- a/helpers/lh_chroot_dpkg +++ b/helpers/lh_chroot_dpkg @@ -67,14 +67,14 @@ EOF ;; remove) + Echo_message "Deconfiguring file /sbin/start-stop-daemon" + # Checking lock file Check_lockfile .lock # Creating lock file Create_lockfile .lock - Echo_message "Deconfiguring file /sbin/start-stop-daemon" - # Restore start-stop-daemon program mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc index c0e1a76..eec9da0 100755 --- a/helpers/lh_chroot_proc +++ b/helpers/lh_chroot_proc @@ -36,13 +36,13 @@ Read_conffile config/source Read_conffile "${LH_CONFIG}" Set_defaults -Echo_message "Begin mounting /proc..." - # Requiring stage file Require_stagefile .stage/bootstrap case "${1}" in install) + Echo_message "Begin mounting /proc..." + # Checking stage file Check_stagefile .stage/chroot_proc @@ -69,6 +69,8 @@ case "${1}" in ;; remove) + Echo_message "Begin unmounting /proc..." + # Checking lock file Check_lockfile .lock diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs index b7931ae..04e67de 100755 --- a/helpers/lh_chroot_sysfs +++ b/helpers/lh_chroot_sysfs @@ -36,13 +36,13 @@ Read_conffile config/source Read_conffile "${LH_CONFIG}" Set_defaults -Echo_message "Begin mounting /sys..." - # Requiring stage file Require_stagefile .stage/bootstrap case "${1}" in install) + Echo_message "Begin mounting /sys..." + # Checking stage file Check_stagefile .stage/chroot_sysfs @@ -69,6 +69,8 @@ case "${1}" in ;; remove) + Echo_message "Begin unmounting /sys..." + # Checking lock file Check_lockfile .lock -- cgit v1.0