diff options
author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:11 +0200 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:18:30 +0100 |
commit | 85c342c299231131d22764c0dfdcf977c57ce147 (patch) | |
tree | 1226c8a7ad43a2dd53e411c2e379969424e88e32 /helpers/lh_chroot_proc | |
parent | d1ee66e44c8272bb7a0053a456a3d8b0bd152268 (diff) | |
download | live-build-85c342c299231131d22764c0dfdcf977c57ce147.zip live-build-85c342c299231131d22764c0dfdcf977c57ce147.tar.gz |
Adding live-helper 1.0~a13-1.
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 563dbb4..66b4c3c 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 |