xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-30 19:02:27 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Fix warnings of newer dracut versions
This commit is contained in:
besawn
2022-07-07 11:23:09 -04:00
committed by GitHub
parent 77926b009c be8297e4c9
commit ecb0232faf
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/share/xcat/netboot/rh/genimage
View File

@@ -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";

14
xCAT-server/share/xcat/netboot/sles/genimage
View File

@@ -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";

10
xCAT-server/share/xcat/netboot/ubuntu/genimage
View File

@@ -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";