Mailinglist Archive: opensuse-commit (1929 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package perl-Bootloader for openSUSE:Factory
checked in at Sun Oct 16 12:56:16 CEST 2011.



--------
--- openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes    2011-09-23 
12:36:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes        
2011-10-14 09:34:15.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 14 09:31:40 CEST 2011 - snwint@xxxxxxx
+
+- support more devices in fallback heuristics
+- add basic grub2 support to update-bootloader
+- 0.5.22
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  perl-Bootloader-0.5.21.tar.bz2

New:
----
  perl-Bootloader-0.5.22.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.W5EKeK/_old  2011-10-16 12:56:12.000000000 +0200
+++ /var/tmp/diff_new_pack.W5EKeK/_new  2011-10-16 12:56:12.000000000 +0200
@@ -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 @@
 /boot/boot.readme
 %dir %attr(0700,root,root) /var/log/YaST2
 
-%changelog -n perl-Bootloader
+%changelog

++++++ perl-Bootloader-0.5.21.tar.bz2 -> perl-Bootloader-0.5.22.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/perl-Bootloader-0.5.21/Makefile 
new/perl-Bootloader-0.5.22/Makefile
--- old/perl-Bootloader-0.5.21/Makefile 2011-09-21 12:26:54.000000000 +0200
+++ new/perl-Bootloader-0.5.22/Makefile 2011-10-14 09:32:09.000000000 +0200
@@ -119,4 +119,4 @@
 
 clean:
        if [ -f .exportdir ] && [ -d "$$(<.exportdir)" ]; then echo 
"$$(<.exportdir)"; rm -rf "$$(<.exportdir)"; fi
-       rm -f .exportdir .built .submitted
+       rm -f .exportdir .built .submitted *~ */*~ */*/*~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/perl-Bootloader-0.5.21/perl-Bootloader.changes 
new/perl-Bootloader-0.5.22/perl-Bootloader.changes
--- old/perl-Bootloader-0.5.21/perl-Bootloader.changes  2011-09-21 
12:26:54.000000000 +0200
+++ new/perl-Bootloader-0.5.22/perl-Bootloader.changes  2011-10-14 
09:32:09.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Oct 14 09:31:40 CEST 2011 - snwint@xxxxxxx
+
+- 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@xxxxxxx
 
 - also log udevinfo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/perl-Bootloader-0.5.21/src/Core/GRUB.pm 
new/perl-Bootloader-0.5.22/src/Core/GRUB.pm
--- old/perl-Bootloader-0.5.21/src/Core/GRUB.pm 2011-09-21 12:26:54.000000000 
+0200
+++ new/perl-Bootloader-0.5.22/src/Core/GRUB.pm 2011-10-14 09:32:09.000000000 
+0200
@@ -394,7 +394,7 @@
         $partition = undef;
 
         if (
-            $original =~ m#^/dev/[hs]d[a-z]{1,2}(\d+)$# ||
+            $original =~ m#^/dev/(?:vx|das|[ehpsvx])d[a-z]{1,2}(\d+)$# ||
             $original =~ m#^/dev/\S+\-part(\d+)$# ||
             $original =~ m#^/dev(?:/[^/]+){1,2}p(\d+)$#
         ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/perl-Bootloader-0.5.21/update-bootloader 
new/perl-Bootloader-0.5.22/update-bootloader
--- old/perl-Bootloader-0.5.21/update-bootloader        2011-09-21 
12:26:54.000000000 +0200
+++ new/perl-Bootloader-0.5.22/update-bootloader        2011-10-14 
09:32:09.000000000 +0200
@@ -212,6 +212,26 @@
   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
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/perl-Bootloader-0.5.21/version 
new/perl-Bootloader-0.5.22/version
--- old/perl-Bootloader-0.5.21/version  2011-09-21 12:26:54.000000000 +0200
+++ new/perl-Bootloader-0.5.22/version  2011-10-14 09:32:09.000000000 +0200
@@ -1 +1 @@
-0.5.21
+0.5.22

++++++ update-bootloader ++++++
--- /var/tmp/diff_new_pack.W5EKeK/_old  2011-10-16 12:56:12.000000000 +0200
+++ /var/tmp/diff_new_pack.W5EKeK/_new  2011-10-16 12:56:12.000000000 +0200
@@ -212,6 +212,26 @@
   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
 }

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx