diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-13 17:11:53 +0000 |
---|---|---|
committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-17 18:57:02 +0000 |
commit | fe9195b59c9647598ecea00900edfe2678bddcac (patch) | |
tree | 91e0a0e756cabb781035d58371b5b78590dc1568 /scripts/build/chroot_selinuxfs | |
parent | 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 (diff) | |
download | vyos-live-build-fe9195b59c9647598ecea00900edfe2678bddcac.tar.gz vyos-live-build-fe9195b59c9647598ecea00900edfe2678bddcac.zip |
stagefiles: further robustify with auto filenames
as suggested by Raphaƫl
rather than have fixed stagefile filename strings at all in the scripts,
use `$(basename $0)` to use the name of the script (which is the same for
almost all cases anyway, and the stage files are supposed to be almost
exclusively unique per-script). we can thus simplify things by determining
the filename for most use cases within the functions themselves.
this does change the file used by a couple of scripts, affecting backwards
compatibility of executing live-build upon an existing partially or fully
completed build:
- binary_grub-pc used "binary_grub"
- chroot_includes used "includes.chroot"
care had to be taken for the following cases:
- there are some cases like bootstrap_cache, source_debian and
bootstrap_debootstrap which are dealing with more than one file, and/or
otherwise a filename that is not specific to the script itself exactly,
or should not be based upon its name.
- some cases like chroot_cache, bootstrap_cache and
chroot_install-packages need to append something to the end of the name
depending upon which pass/action mode the script is being executed with.
- furthermore in the bootstrap_cache case one of the filenames is used
within the bootstrap_debootstrap and thus needs very careful handling
to be certain that a change in filename of bootstrap_cache does not
break bootstrap_debootstrap.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/chroot_selinuxfs')
-rwxr-xr-x | scripts/build/chroot_selinuxfs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs index 77f94e98a..aa94da516 100755 --- a/scripts/build/chroot_selinuxfs +++ b/scripts/build/chroot_selinuxfs @@ -24,8 +24,6 @@ Init_config_data "${@}" # Requiring stage file Require_stagefile config bootstrap -STAGE_FILE="chroot_selinuxfs" - case "${1}" in install) if [ -e /sys/fs/selinux/enforce ] && [ "$(cat /sys/fs/selinux/enforce)" = "1" ] @@ -33,7 +31,7 @@ case "${1}" in Echo_message "Begin mounting /sys/fs/selinux..." # Checking stage file - Check_stagefile "${STAGE_FILE}" + Check_stagefile # Acquire lock file Acquire_lockfile @@ -45,7 +43,7 @@ case "${1}" in mount -t selinuxfs -o x-gvfs-hide selinuxfs-live chroot/sys/fs/selinux # Creating stage file - Create_stagefile "${STAGE_FILE}" + Create_stagefile fi ;; @@ -62,7 +60,7 @@ case "${1}" in fi # Removing stage file - Remove_stagefile "${STAGE_FILE}" + Remove_stagefile ;; *) |