diff options
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/bootloader-config | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 81fbf4097..c3dbe1aa4 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- bootloader-config: + o do not build initrd if no bootloader is detected and + --no-initd argument is supplied - drakauth: o install nss-pam-ldapd instead of nss_ldap (mga#9375) diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config index cb7a13de8..f59a76067 100755 --- a/perl-install/standalone/bootloader-config +++ b/perl-install/standalone/bootloader-config @@ -65,6 +65,9 @@ my $bootloader; $bootloader = bootloader::read($all_hds); if (!$bootloader) { if (member($action, 'add-kernel', 'remove-kernel')) { + if ($no_initrd) { + die "Cannot find a bootloader installed and initrd build suppressed\n"; + } warn "Cannot find a boot loader installed. Only taking care of initrd\n"; } else { die "Cannot find a boot loader installed\n"; |