diff options
author | torben | 2015-12-10 16:55:37 +0100 |
---|---|---|
committer | torben | 2015-12-10 16:55:37 +0100 |
commit | 43c6a1c73ed18cea3c0dedcc2e81a5b7a3d85406 (patch) | |
tree | da7afd36e35f528e174c5e5dfda18d1fa4af5fbc /builder/dnbd3-rootfs/module-setup.sh | |
parent | Initialize new offline initramfs creation feature. (diff) | |
download | systemd-init-43c6a1c73ed18cea3c0dedcc2e81a5b7a3d85406.tar.gz systemd-init-43c6a1c73ed18cea3c0dedcc2e81a5b7a3d85406.tar.xz systemd-init-43c6a1c73ed18cea3c0dedcc2e81a5b7a3d85406.zip |
More fakechroot features.
Diffstat (limited to 'builder/dnbd3-rootfs/module-setup.sh')
-rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 9101851c..ead0c99c 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -16,13 +16,13 @@ clean() { # dracut itself. if [[ -f "$moddir/binaries/nbd/nbd.ko" ]]; then - utils_clean_nbd "$moddir/binaries/nbd/" + build_clean_nbd "$moddir/binaries/nbd/" fi if [[ -f "$moddir/binaries/dnbd3/build/dnbd3.ko" || ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]; then - utils_clean_dnbd3 "$moddir/binaries/dnbd3/" + build_clean_dnbd3 "$moddir/binaries/dnbd3/" fi if [[ -f "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then - utils_clean_systemd_preserve_process_marker \ + build_clean_systemd_preserve_process_marker \ "$moddir/binaries/systemd-preserve-process-marker/" fi return 0 @@ -33,13 +33,15 @@ check() { exceptions.activate if [[ ! -f "$moddir/binaries/nbd/nbd.ko" ]]; then - utils_compile_nbd "$moddir/binaries/nbd/" + build_compile_nbd "$moddir/binaries/nbd/" fi - if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" || ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]; then - utils_compile_dnbd3 "$moddir/binaries/dnbd3/" + if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \ + [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]] + then + build_compile_dnbd3 "$moddir/binaries/dnbd3/" fi if [[ ! -f "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then - utils_compile_systemd_preserve_process_marker \ + build_compile_systemd_preserve_process_marker \ "$moddir/binaries/systemd-preserve-process-marker/" fi @@ -129,13 +131,14 @@ install() { # region scripts - inst "$moddir/scripts/utils.sh" "/usr/lib/utils.sh" - for file in "$moddir/scripts/rebash/"*; do - inst "$file" "/usr/lib/rebash/$(basename $file)" + local file_path + for file_path in "$moddir/scripts/rebash/"*; do + inst "$file_path" "/usr/lib/rebash/$(basename "$file_path")" done # This script is triggered by udev upon finding the right partitions for # persistent sessions. - inst "$moddir/scripts/prepare-persistent-disks" /sbin/prepare-persistent-disks + inst "$moddir/scripts/prepare-persistent-disks" \ + /sbin/prepare-persistent-disks # endregion |