diff options
Diffstat (limited to 'helpers/lh_chroot_proc')
| -rwxr-xr-x | helpers/lh_chroot_proc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc index 563dbb412..66b4c3c32 100755 --- a/helpers/lh_chroot_proc +++ b/helpers/lh_chroot_proc @@ -9,13 +9,15 @@ set -e -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh do - . ${FUNCTION} + . "${FUNCTION}" done -# Set static variables +# Setting static variables DESCRIPTION="mount /proc" HELP="" USAGE="${PROGRAM} {install|remove} [--force]" @@ -25,8 +27,6 @@ Arguments "${@}" # Ensure that a system is built as root lh_testroot -Echo_debug "Init ${PROGRAM}" - # Reading configuration files Read_conffile config/common Read_conffile config/bootstrap @@ -35,7 +35,7 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "chroot_proc: Init" +Echo_message "Begin mounting /proc..." # Requiring stage file Require_stagefile .stage/bootstrap @@ -51,11 +51,8 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ ! -d chroot/proc ] - then - # Creating mountpoint - mkdir -p chroot/proc - fi + # Creating mountpoint + mkdir -p chroot/proc # Mounting /proc ${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc |