summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-26 06:36:11 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-26 06:36:11 +0000
commit9466e5de86b12037e28cda626cb9650e4de0c777 (patch)
tree2929ccdaec5dec752e407ab0c503c6bf2c12ebc5 /perl-install/standalone
parente6bcf5317254e458b255fc7d017fb7e1e2aab20a (diff)
downloaddrakx-9466e5de86b12037e28cda626cb9650e4de0c777.tar
drakx-9466e5de86b12037e28cda626cb9650e4de0c777.tar.gz
drakx-9466e5de86b12037e28cda626cb9650e4de0c777.tar.bz2
drakx-9466e5de86b12037e28cda626cb9650e4de0c777.tar.xz
drakx-9466e5de86b12037e28cda626cb9650e4de0c777.zip
revert more rosa crap
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/bootloader-config17
1 files changed, 0 insertions, 17 deletions
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index a9b94d477..cb7a13de8 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -61,7 +61,6 @@ if ($image) {
my $all_hds = fsedit::get_hds();
fs::get_info_from_fstab($all_hds);
-my $have_grub2 = -e "/boot/grub2/grub.cfg";
my $bootloader;
$bootloader = bootloader::read($all_hds);
if (!$bootloader) {
@@ -89,12 +88,6 @@ sub remove_kernel() {
unlink "/lib/modules/$kernel_version/source";
remove_now_broken_boot_symlinks();
- if ($have_grub2) {
- system('grub2-mkconfig', '-o', '/boot/grub2/grub.cfg');
- modify_bootloader();
- return;
- }
-
if (!$bootloader) {
#- removing the initrd for weird configs where no mdv bootloader is configured
my $kernel_str = bootloader::vmlinuz2kernel_str($image) or die "bad kernel name $image\n";
@@ -166,16 +159,12 @@ sub add_kernel() {
(grep_each { member($::a, 'vga', 'lock') } %{$bootloader->{default_options}}),
);
- if ($have_grub2) {
- system('grub2-mkconfig', '-o', '/boot/grub2/grub.cfg');
- } else {
#- short name
bootloader::add_kernel($bootloader, $kernel_str, { %opts }, 0, $no_initrd) if !$no_short_name;
#- long name
$kernel_str->{use_long_name} = 1;
bootloader::add_kernel($bootloader, $kernel_str, { %opts }, 1, $no_initrd);
- }
modify_bootloader();
}
@@ -192,12 +181,6 @@ sub configure_ide_controller() {
}
sub modify_bootloader() {
- if ($have_grub2) {
- my $boot_partition = `df -h /boot |(read; awk '{print \$1; exit}'|sed 's/[[:digit:]]*\$//')`;
- system('grub2-install', $boot_partition);
- return;
- }
-
!$no_entry or return;
bootloader::action($bootloader, 'write', $all_hds);