From 2111baba473cd292c5a177a920d03304577fa731 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Mon, 17 Aug 2020 16:06:37 -0400 Subject: [PATCH] Verify if kernel-modules-extra exists before adding --- xCAT-server/share/xcat/netboot/rh/genimage | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage index 0e27f9491..0620ec5af 100755 --- a/xCAT-server/share/xcat/netboot/rh/genimage +++ b/xCAT-server/share/xcat/netboot/rh/genimage @@ -1079,9 +1079,9 @@ sub mkinitrd_dracut { #update etc/dracut.conf open($DRACUTCONF, '>', "$rootimg_dir/etc/dracut.conf"); - my $dracutmodulelist = "xcat nfs base network kernel-modules kernel-modules-extra syslog"; + my $dracutmodulelist = "xcat nfs base network kernel-modules syslog"; - foreach (qw/systemd systemd-initrd dracut-systemd fadump/) { + foreach (qw/systemd systemd-initrd dracut-systemd fadump kernel-modules-extra/) { my ($dir) = glob($dracutmoduledir . "[0-9]*" . $_); if (-d $dir) { $dracutmodulelist .= " $_"; @@ -1120,9 +1120,9 @@ sub mkinitrd_dracut { $perm = (stat("$fullpath/$dracutdir/installkernel"))[2]; chmod($perm & 07777, "$dracutmpath/installkernel"); - my $dracutmodulelist = "xcat nfs base network kernel-modules kernel-modules-extra syslog"; + my $dracutmodulelist = "xcat nfs base network kernel-modules syslog"; - foreach (qw/systemd systemd-initrd dracut-systemd fadump/) { + foreach (qw/systemd systemd-initrd dracut-systemd fadump kernel-modules-extra/) { my ($dir) = glob($dracutmoduledir . "[0-9]*" . $_); if (-d $dir) { $dracutmodulelist .= " $_";