From 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Thu, 12 Mar 2020 01:21:39 +0000 Subject: 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 --- scripts/build/chroot_selinuxfs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts/build/chroot_selinuxfs') 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}" ;; *) -- cgit v1.2.3