diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-12 01:21:39 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-17 18:57:02 +0000 |
| commit | 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 (patch) | |
| tree | 17d1ccea5c085c5afd62361d2fe97a14c951cb9b /scripts/build/chroot_selinuxfs | |
| parent | bea349c82237ee165baaf1f7e8043a26e0c14417 (diff) | |
| download | vyos-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_selinuxfs')
| -rwxr-xr-x | scripts/build/chroot_selinuxfs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs index 570ea7857..77f94e98a 100755 --- a/scripts/build/chroot_selinuxfs +++ b/scripts/build/chroot_selinuxfs @@ -22,7 +22,9 @@ USAGE="${PROGRAM} {install|remove} [--force]" Init_config_data "${@}" # Requiring stage file -Require_stagefile .build/config .build/bootstrap +Require_stagefile config bootstrap + +STAGE_FILE="chroot_selinuxfs" case "${1}" in install) @@ -31,7 +33,7 @@ case "${1}" in Echo_message "Begin mounting /sys/fs/selinux..." # Checking stage file - Check_stagefile .build/chroot_selinuxfs + Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -43,7 +45,7 @@ case "${1}" in mount -t selinuxfs -o x-gvfs-hide selinuxfs-live chroot/sys/fs/selinux # Creating stage file - Create_stagefile .build/chroot_selinuxfs + Create_stagefile "${STAGE_FILE}" fi ;; @@ -60,7 +62,7 @@ case "${1}" in fi # Removing stage file - rm -f .build/chroot_selinuxfs + Remove_stagefile "${STAGE_FILE}" ;; *) |