Merge pull request #7179 from Obihoernchen/fix-dracut-warnings

Fix warnings of newer dracut versions
xcat2 · Jul 7, 2022 · ecb0232 · ecb0232
2 parents 77926b0 + be8297e
commit ecb0232
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -1103,9 +1103,9 @@ sub mkinitrd_dracut {
             }
         }
 
-        print $DRACUTCONF qq{dracutmodules+="$dracutmodulelist"\n};
-        print $DRACUTCONF qq{add_drivers+="$add_drivers"\n};
-        print $DRACUTCONF qq{filesystems+="nfs"\n};
+        print $DRACUTCONF qq{dracutmodules+=" $dracutmodulelist "\n};
+        print $DRACUTCONF qq{add_drivers+=" $add_drivers "\n};
+        print $DRACUTCONF qq{filesystems+=" nfs "\n};
         close $DRACUTCONF;
     } elsif ($mode eq "stateless") {
         cp("$fullpath/$dracutdir/install.netboot", "$dracutmpath/install");
@@ -1146,8 +1146,8 @@ sub mkinitrd_dracut {
 
         # update etc/dracut.conf
         open($DRACUTCONF, '>', "$rootimg_dir/etc/dracut.conf");
-        print $DRACUTCONF qq{dracutmodules+="$dracutmodulelist"\n};
-        print $DRACUTCONF qq{add_drivers+="$add_drivers"\n};
+        print $DRACUTCONF qq{dracutmodules+=" $dracutmodulelist "\n};
+        print $DRACUTCONF qq{add_drivers+=" $add_drivers "\n};
         close $DRACUTCONF;
     } else {
         xdie "the mode: $mode is not supported by genimage";

diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -1097,13 +1097,13 @@ sub mkinitrd_dracut {
         #update etc/dracut.conf
         open($DRACUTCONF, '>', "$rootimg_dir/etc/dracut.conf");
         if (-d glob($dracutmoduledir . "[0-9]*fadump")) {
-            print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules lvm fadump"\n};
+            print $DRACUTCONF qq{dracutmodules+=" xcat nfs base network kernel-modules lvm fadump "\n};
         }
         else {
-            print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules lvm"\n};
+            print $DRACUTCONF qq{dracutmodules+=" xcat nfs base network kernel-modules lvm "\n};
         }
-        print $DRACUTCONF qq{add_drivers+="$add_drivers"\n};
-        print $DRACUTCONF qq{filesystems+="nfs"\n};
+        print $DRACUTCONF qq{add_drivers+=" $add_drivers "\n};
+        print $DRACUTCONF qq{filesystems+=" nfs "\n};
         close $DRACUTCONF;
     } elsif ($mode eq "stateless") {
         cp("$fullpath/$dracutdir/install.netboot", "$dracutmpath/install");
@@ -1135,12 +1135,12 @@ sub mkinitrd_dracut {
         # update etc/dracut.conf
         open($DRACUTCONF, '>', "$rootimg_dir/etc/dracut.conf");
         if (-d glob($dracutmoduledir . "[0-9]*fadump")) {
-            print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules lvm fadump syslog"\n};
+            print $DRACUTCONF qq{dracutmodules+=" xcat nfs base network kernel-modules lvm fadump syslog "\n};
         }
         else {
-            print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules lvm syslog"\n};
+            print $DRACUTCONF qq{dracutmodules+=" xcat nfs base network kernel-modules lvm syslog "\n};
         }
-        print $DRACUTCONF qq{add_drivers+="$add_drivers"\n};
+        print $DRACUTCONF qq{add_drivers+=" $add_drivers "\n};
         close $DRACUTCONF;
     } else {
         xdie "the mode: $mode is not supported by genimage";

diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage
@@ -947,9 +947,9 @@ sub mkinitrd_dracut {
 
         # update etc/dracut.conf
         open($DRACUTCONF, '>', "$rootimg_dir/etc/dracut.conf");
-        print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules"\n};
-        print $DRACUTCONF qq{add_drivers+="$add_drivers"\n};
-        print $DRACUTCONF qq{filesystems+="nfs"\n};
+        print $DRACUTCONF qq{dracutmodules+=" xcat nfs base network kernel-modules "\n};
+        print $DRACUTCONF qq{add_drivers+=" $add_drivers "\n};
+        print $DRACUTCONF qq{filesystems+=" nfs "\n};
         close $DRACUTCONF;
     } elsif ($mode eq "stateless") {
         cp("$fullpath/$dracutdir/install.netboot", "$dracutmpath/install");
@@ -977,8 +977,8 @@ sub mkinitrd_dracut {
 
         # update etc/dracut.conf
         open($DRACUTCONF, '>', "$rootimg_dir/etc/dracut.conf");
-        print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules"\n};
-        print $DRACUTCONF qq{add_drivers+="$add_drivers"\n};
+        print $DRACUTCONF qq{dracutmodules+=" xcat nfs base network kernel-modules "\n};
+        print $DRACUTCONF qq{add_drivers+=" $add_drivers "\n};
         close $DRACUTCONF;
     } else {
         xdie "the mode: $mode is not supported by genimage";