diff options
| author | jandob | 2016-03-01 15:45:22 +0100 |
|---|---|---|
| committer | jandob | 2016-03-01 15:45:22 +0100 |
| commit | c61bbf71a5bd5d00a504a8387d87f874dc8af8f1 (patch) | |
| tree | 0906bafcf70872aa2165073ef38667af4d0c2caf /builder/dnbd3-rootfs/hooks | |
| parent | update rebash (diff) | |
| download | systemd-init-c61bbf71a5bd5d00a504a8387d87f874dc8af8f1.tar.gz systemd-init-c61bbf71a5bd5d00a504a8387d87f874dc8af8f1.tar.xz systemd-init-c61bbf71a5bd5d00a504a8387d87f874dc8af8f1.zip | |
move block device discovery out of rebash
Diffstat (limited to 'builder/dnbd3-rootfs/hooks')
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/prepare-root-partition.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh index 88568995..fab1d45e 100755 --- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh +++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh @@ -2,6 +2,7 @@ # region imports type getarg >/dev/null 2>&1 || source /lib/dracut-lib.sh source "/usr/lib/rebash/core.sh" +core.import "/usr/lib/openslx/tools.sh" core.import exceptions exceptions.activate core.import utils @@ -15,7 +16,7 @@ SLX_SERVER_BASE="$(getargs slxbase=)" source /etc/openslx # region find writable partition -if ! persistent_device=$(utils.find_block_device \ +if ! persistent_device=$(tools.find_block_device \ "$SLX_WRITABLE_DEVICE_IDENTIFIER"); then logging.warn "Failed to find unique device with identifier" \ "'${SLX_WRITABLE_DEVICE_IDENTIFIER}'; matched devices:" \ @@ -23,7 +24,7 @@ if ! persistent_device=$(utils.find_block_device \ fi # TODO move somewhere else -#tmp_device="$(utils.find_block_device \ +#tmp_device="$(tools.find_block_device \ #'$SLX_TMP_PARTITION_IDENTIFIER')" #if [ -n $tmp_device ]; then @@ -109,7 +110,7 @@ fi # region find read-only partition if [ -z "$SLX_SYSTEM_PARTITION_PREPARATION_SCRIPT" ]; then - read_only_partition="$(utils.find_block_device \ + read_only_partition="$(tools.find_block_device \ "$SLX_SYSTEM_PARTITION_IDENTIFIER" "$read_only_device")" else eval "$SLX_SYSTEM_PARTITION_PREPARATION_SCRIPT" |