From 599b85512988448e8c7e7a563f515b18ebaabe79 Mon Sep 17 00:00:00 2001
From: Victor Mayoral Vilches
Date: Thu, 2 Sep 2021 16:52:11 -0700
Subject: Disable DomUs in disk_image if DOMU_NOBOOT is not set

Signed-off-by: Victor Mayoral Vilches <v.mayoralv@gmail.com>
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
---
 scripts/disk_image | 53 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

(limited to 'scripts')

diff --git a/scripts/disk_image b/scripts/disk_image
index b5a3dae..5e95542 100755
--- a/scripts/disk_image
+++ b/scripts/disk_image
@@ -66,35 +66,38 @@ function generate_domU_configs()
 
     while test $i -lt $NUM_DOMUS
     do
-        dest="$DESTDIR/part/disk$j/etc/xen/domU$i.cfg"
-        echo "name=\"domU$i\"" >> $dest
-        echo "memory=${DOMU_MEM[$i]}" >> $dest
-        echo "vcpus=${DOMU_VCPUS[$i]}" >> $dest
-        echo "# mount $first_part /boot" >> $dest
-        echo "kernel=\"/boot/${DOMU_KERNEL[$i]}\"" >> $dest
-        if test "${DOMU_RAMDISK[$i]}"
+        if test "${DOMU_NOBOOT[$i]}"
         then
-            echo "ramdisk=\"/boot/${DOMU_RAMDISK[$i]}\"" >> $dest
-        fi
+            dest="$DESTDIR/part/disk$j/etc/xen/domU$i.cfg"
+            echo "name=\"domU$i\"" >> $dest
+            echo "memory=${DOMU_MEM[$i]}" >> $dest
+            echo "vcpus=${DOMU_VCPUS[$i]}" >> $dest
+            echo "# mount $first_part /boot" >> $dest
+            echo "kernel=\"/boot/${DOMU_KERNEL[$i]}\"" >> $dest
+            if test "${DOMU_RAMDISK[$i]}"
+            then
+                echo "ramdisk=\"/boot/${DOMU_RAMDISK[$i]}\"" >> $dest
+            fi
 
-        if [ -z "${DOMU_CMD[$i]}" ]
-        then
-            DOMU_CMD[$i]="console=hvc0"
-        fi
-        if [[ ! ${DOMU_CMD[$i]} =~ root= ]]
-        then
-            if test -z "${DOMU_ROOTFS[$i]}"
+            if [ -z "${DOMU_CMD[$i]}" ]
             then
-                DOMU_CMD[$i]="${DOMU_CMD[$i]} root=/dev/ram0" >> $dest
-            else
-                DOMU_CMD[$i]="${DOMU_CMD[$i]} root=/dev/xvda" >> $dest
+                DOMU_CMD[$i]="console=hvc0"
+            fi
+            if [[ ! ${DOMU_CMD[$i]} =~ root= ]]
+            then
+                if test -z "${DOMU_ROOTFS[$i]}"
+                then
+                    DOMU_CMD[$i]="${DOMU_CMD[$i]} root=/dev/ram0" >> $dest
+                else
+                    DOMU_CMD[$i]="${DOMU_CMD[$i]} root=/dev/xvda" >> $dest
+                fi
+            fi
+            echo "extra=\"${DOMU_CMD[$i]}\"" >> $dest
+            if test "${DOMU_ROOTFS[$i]}"
+            then
+                add_rootfs $n
+                echo "disk=[\"$retval,,xvda\"]" >> $dest
             fi
-        fi
-        echo "extra=\"${DOMU_CMD[$i]}\"" >> $dest
-        if test "${DOMU_ROOTFS[$i]}"
-        then
-            add_rootfs $n
-            echo "disk=[\"$retval,,xvda\"]" >> $dest
         fi
 
         n=$(( $n + 1 ))
-- 
cgit v1.2.3