- add read/write grub2-efi's settings for global options from yast2's

bootloader option widgets, including timeout, hiddenmenu, vgamode, append
  and default
- add read/write grub2's settings for serial console from yast2's bootloader
  option widgets
- add read/write grub2's settings for global options from yast2's bootloader
  option widgets, including timeout, hiddenmenu, vgamode, append and default
- fix bootloader_entry util to correctly handle grub2's case (bnc#755183)

OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=55
This commit is contained in:
Steffen Winterfeldt 2012-04-23 09:31:34 +00:00 committed by Git OBS Bridge
parent 2fd5373901
commit cbd55607b5
6 changed files with 34 additions and 4 deletions

View File

@ -194,6 +194,10 @@ function add_entry()
update_bootloader --refresh || exit 1
;;
esac
elif [ -f $PERL_BOOTLOADER_TESTSUITE_PATH/etc/sysconfig/bootloader ] &&
[ -f $PERL_BOOTLOADER_TESTSUITE_PATH/boot/grub2/grub.cfg -o \
-f $PERL_BOOTLOADER_TESTSUITE_PATH/boot/grub2-efi/grub.cfg ]; then
update_bootloader --refresh || exit 1
fi
fi
}
@ -266,6 +270,10 @@ function remove_entry()
# Run the bootloader (e.g., lilo).
update_bootloader --refresh || exit 1
elif [ -f $PERL_BOOTLOADER_TESTSUITE_PATH/etc/sysconfig/bootloader ] &&
[ -f $PERL_BOOTLOADER_TESTSUITE_PATH/boot/grub2/grub.cfg -o \
-f $PERL_BOOTLOADER_TESTSUITE_PATH/boot/grub2-efi/grub.cfg ]; then
update_bootloader --refresh || exit 1
fi
fi
}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c9aa2bf41ca0b6d18589fc632e91e52a329cb058966d86645b750ea99ad9a868
size 151853

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02d9ef961f53089b40efb1ac89eb6e0c75f8b485886b5d4ae3ac420704698215
size 152766

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Apr 23 11:26:15 CEST 2012 - mchang@suse.de
- add read/write grub2-efi's settings for global options from yast2's
bootloader option widgets, including timeout, hiddenmenu, vgamode, append
and default
- add read/write grub2's settings for serial console from yast2's bootloader
option widgets
- add read/write grub2's settings for global options from yast2's bootloader
option widgets, including timeout, hiddenmenu, vgamode, append and default
- fix bootloader_entry util to correctly handle grub2's case (bnc#755183)
-------------------------------------------------------------------
Thu Mar 22 10:30:34 UTC 2012 - mchang@suse.com

View File

@ -17,7 +17,7 @@
Name: perl-Bootloader
Version: 0.6.1
Version: 0.6.2
Release: 0
Requires: perl-base = %{perl_version}
Requires: e2fsprogs

View File

@ -212,6 +212,16 @@ if (Bootloader::Tools::GetBootloader() eq "none")
exit 0;
}
if (Bootloader::Tools::GetBootloader() =~ /^(grub2|grub2-efi)$/)
{
open (LOG, ">>$logname");
print LOG ("grub2 bootloader, no add/remove section support\n");
close LOG;
delete $oper{add};
delete $oper{remove};
}
if ($opt_image and $opt_image !~ m;^/;) {
$opt_image = getcwd . '/' . $opt_image
}