summaryrefslogtreecommitdiff
path: root/scripts/build/chroot_proc
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-12 01:21:39 +0000
committerLyndon Brown <jnqnfe@gmail.com>2020-03-17 18:57:02 +0000
commit04d9ee0211e7cf2d5f637941ff6579b4f5462da6 (patch)
tree17d1ccea5c085c5afd62361d2fe97a14c951cb9b /scripts/build/chroot_proc
parentbea349c82237ee165baaf1f7e8043a26e0c14417 (diff)
downloadvyos-live-build-04d9ee0211e7cf2d5f637941ff6579b4f5462da6.tar.gz
vyos-live-build-04d9ee0211e7cf2d5f637941ff6579b4f5462da6.zip
stagefiles: simplify & robustify
- avoid all need to pass ".build/" path in stage file names into the functions - add a helper to remove a stage file (required to complete the above properly) - avoid duplicating filenames within scripts which makes them prone to mistakes (some instances of which I've actually encountered and had to fix) Gbp-Dch: Short
Diffstat (limited to 'scripts/build/chroot_proc')
-rwxr-xr-xscripts/build/chroot_proc10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc
index 8105e8e34..104a2dcc3 100755
--- a/scripts/build/chroot_proc
+++ b/scripts/build/chroot_proc
@@ -22,14 +22,16 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Init_config_data "${@}"
# Requiring stage file
-Require_stagefile .build/config .build/bootstrap
+Require_stagefile config bootstrap
+
+STAGE_FILE="chroot_proc"
case "${1}" in
install)
Echo_message "Begin mounting /proc..."
# Checking stage file
- Check_stagefile .build/chroot_proc
+ Check_stagefile "${STAGE_FILE}"
# Acquire lock file
Acquire_lockfile
@@ -41,7 +43,7 @@ case "${1}" in
mount -t proc -o x-gvfs-hide proc-live chroot/proc
# Creating stage file
- Create_stagefile .build/chroot_proc
+ Create_stagefile "${STAGE_FILE}"
;;
remove)
@@ -63,7 +65,7 @@ case "${1}" in
fi
# Removing stage file
- rm -f .build/chroot_proc
+ Remove_stagefile "${STAGE_FILE}"
;;
*)