diff --git a/build-tests/x86/tumbleweed/test-image-disk-ramdisk/appliance.kiwi b/build-tests/x86/tumbleweed/test-image-disk-ramdisk/appliance.kiwi index 2fe04e94b69..39848080763 100644 --- a/build-tests/x86/tumbleweed/test-image-disk-ramdisk/appliance.kiwi +++ b/build-tests/x86/tumbleweed/test-image-disk-ramdisk/appliance.kiwi @@ -73,5 +73,8 @@ + + + diff --git a/dracut/modules.d/90kiwi-dump/kiwi-ramdisk-deployment-generator.sh b/dracut/modules.d/90kiwi-dump/kiwi-ramdisk-deployment-generator.sh index d0eadcc60e5..bd2965a2936 100755 --- a/dracut/modules.d/90kiwi-dump/kiwi-ramdisk-deployment-generator.sh +++ b/dracut/modules.d/90kiwi-dump/kiwi-ramdisk-deployment-generator.sh @@ -26,16 +26,12 @@ GENERATOR_DIR="$1" [ -e /config.bootoptions ] || exit 1 -# Add a space to /config.bootoptions to make sure the -# following token based read captures all entries -echo -n ' ' >> /config.bootoptions - root_uuid=$( - while read -r -d ' ' opt; do echo "${opt}";done < /config.bootoptions |\ + awk '{ for(i=1; i <= NF; i++) {print $i } }' /config.bootoptions |\ grep root= | cut -f2- -d= ) -[ -z "${root_uuid}" ] && exit 1 +[ -z "${root_uuid}" ] && exit 2 { echo "[Unit]"