diff options
| author | jandob | 2015-11-27 18:04:41 +0100 |
|---|---|---|
| committer | jandob | 2015-11-27 18:04:41 +0100 |
| commit | 85b804b6e185222866986ccc8b18fa7968124e19 (patch) | |
| tree | 8a57039ec3a23b8a0645a37f878cc44502fa7410 | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff) | |
| download | systemd-init-85b804b6e185222866986ccc8b18fa7968124e19.tar.gz systemd-init-85b804b6e185222866986ccc8b18fa7968124e19.tar.xz systemd-init-85b804b6e185222866986ccc8b18fa7968124e19.zip | |
bugfixes
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh | 27 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh | 2 | ||||
| m--------- | builder/dnbd3-rootfs/scripts/rebash | 0 |
3 files changed, 17 insertions, 12 deletions
diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh index 63ef7d1f..7e858b25 100755 --- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh +++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh @@ -28,22 +28,27 @@ local nbd_device='/dev/nbd0' systemd-preserve-process-marker qemu-nbd --connect="$nbd_device" \ "$SLX_DNBD3_DEVICE" --read-only -if [ -n $SLX_SYSTEM_PARTITION_IDENTIFIER ]; then - local read_only_partition="$(utils.create_partition_via_offset \ - "$nbd_device" "$SLX_SYSTEM_PARTITION_IDENTIFIER")" -else # assume raw disk - local read_only_partition="$nbd_device" +# TODO make nicer :) +touch $nbd_device +udevadm settle + +local read_only_partition=$(utils.find_block_device \ + "$SLX_SYSTEM_PARTITION_IDENTIFIER") +if [ -z $read_only_partition ]; then + warn no partition found on device $nbd_device + emergency_shell fi # Make read-only partition writable. ## detect partition for persistent storage local persistent_device=$(utils.find_block_device \ - '$SLX_PERSISTENT_PARTITION_PATTERN_LABEL_UUID_TYPE') -local tmp_device=$(utils.find_block_device \ - '$SLX_TMP_PARTITION_PATTERN_LABEL_UUID_TYPE') + "$SLX_PERSISTENT_PARTITION_PATTERN_LABEL_UUID_TYPE") +# TODO move somewhere else +#local tmp_device=$(utils.find_block_device \ + #'$SLX_TMP_PARTITION_PATTERN_LABEL_UUID_TYPE') -if [ -n $tmp_device ]; then - mount -t auto "$tmp_device" $NEWROOT/tmp -fi +#if [ -n $tmp_device ]; then + #mount -t auto "$tmp_device" $NEWROOT/tmp +#fi local persistent="N" # 'P' for persistent storage, 'N' for not persistent local writable_device diff --git a/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh b/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh index d9b8df4f..21cff17c 100755 --- a/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh +++ b/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh @@ -20,7 +20,7 @@ if ! insmod "${DNBD3_MOD_PATH}"; then return 1 fi -if ! insmod "${NBD_MOD_PATH}"; then +if ! modprobe nbd max_part=16; then warn "Failed to load NBD kernel module..." emergency_shell -n "Error in $0" return 1 diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash -Subproject de05b6e940d4dc72dcd1747832f43917aa8a93b +Subproject 0af83ef07088e5d9b4beaec57cf72d2fb64acb9 |