diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-03-19 23:26:54 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-03-19 23:26:54 +0000 |
| commit | c3969a76064d55b69ae0c98c2750550b9b3ceb9b (patch) | |
| tree | c4f9ec863f92f42fd54c98d91db445430b6e997f | |
| parent | 0e8f91c25cbf321bc7643d0d02738d1cf499cf6e (diff) | |
| download | drakx-c3969a76064d55b69ae0c98c2750550b9b3ceb9b.tar drakx-c3969a76064d55b69ae0c98c2750550b9b3ceb9b.tar.gz drakx-c3969a76064d55b69ae0c98c2750550b9b3ceb9b.tar.bz2 drakx-c3969a76064d55b69ae0c98c2750550b9b3ceb9b.tar.xz drakx-c3969a76064d55b69ae0c98c2750550b9b3ceb9b.zip | |
do not build initrd if no bootloader is detected and --no-initd argument is supplied
| -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"; |