Merge pull request #2383 from OSInside/fix_ramdisk_install

Fix ramdisk install
OSInside · Oct 17, 2023 · c1e28ff · c1e28ff
2 parents 2d74d84 + 91189f9
commit c1e28ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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 @@
         <package name="ca-certificates"/>
         <package name="ca-certificates-mozilla"/>
         <package name="openSUSE-release"/>
+        <package name="grep"/>
+        <package name="xz"/>
+        <package name="shadow"/>
     </packages>
 </image>
diff --git 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]"