diff --git a/perl-Bootloader-0.5.21.tar.bz2 b/perl-Bootloader-0.5.21.tar.bz2 deleted file mode 100644 index fad7fb7..0000000 --- a/perl-Bootloader-0.5.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7f774f9792c3c35dd39394e54dd45be6d0f1db702790b88429572d7936a7d66 -size 147638 diff --git a/perl-Bootloader-0.5.22.tar.bz2 b/perl-Bootloader-0.5.22.tar.bz2 new file mode 100644 index 0000000..9753174 --- /dev/null +++ b/perl-Bootloader-0.5.22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2df41e30999cf4ba00bdcab7e2f1e7e2e557f413bf3b47d9d90169cb3c9ac260 +size 147940 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index 6eb7949..a354a52 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 14 09:31:40 CEST 2011 - snwint@suse.de + +- support more devices in fallback heuristics +- add basic grub2 support to update-bootloader +- 0.5.22 + ------------------------------------------------------------------- Wed Sep 21 12:26:34 CEST 2011 - snwint@suse.de diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index 70d0486..ec14469 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -1,17 +1,25 @@ # -# spec file for package perl-Bootloader (Version 0.5.21) +# spec file for package perl-Bootloader # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: perl-Bootloader -Version: 0.5.21 +Version: 0.5.22 Release: 0 Requires: perl-base = %{perl_version} Requires: e2fsprogs @@ -106,4 +114,4 @@ sed -i '/ZIPL/D;/PowerLILO/D;/\/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorar /boot/boot.readme %dir %attr(0700,root,root) /var/log/YaST2 -%changelog -n perl-Bootloader +%changelog diff --git a/update-bootloader b/update-bootloader index 78b4bc0..b4b7b50 100644 --- a/update-bootloader +++ b/update-bootloader @@ -212,6 +212,26 @@ if (Bootloader::Tools::GetBootloader() eq "none") exit 0; } +if (Bootloader::Tools::GetBootloader() eq "grub2") +{ + open (LOG, ">>$logname"); + print LOG ("grub2 bootloader, let grub2-mkconfig handle everything\n"); + close LOG; + + if (! -d '/boot/grub2' ) { + open (LOG, ">>$logname"); + print LOG ("grub2: Run grub2-install first!\n"); + close LOG; + + exit 1; + } + + system ("cp /boot/grub2/grub.cfg /boot/grub2/grub.cfg.old"); + system ("/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg >>$logname 2>&1"); + + exit 0; +} + if ($opt_image and $opt_image !~ m;^/;) { $opt_image = getcwd . '/' . $opt_image }