commit perl-Bootloader

26 Sep 2008

Hello community,

here is the log from the commit of package perl-Bootloader
checked in at Fri Sep 26 16:55:19 CEST 2008.


--------

--- perl-Bootloader/perl-Bootloader.changes	2008-09-24 23:02:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes	2008-09-26 16:43:15.289078000 +0200
@@ -2 +2 @@
-Wed Sep 24 23:02:14 CEST 2008 - ro@suse.de
+Fri Sep 26 16:23:39 CEST 2008 - jreidinger@suse.cz
@@ -4 +4,7 @@
-- use udevadm info instead of udevinfo 
+- add password generator for grub (bnc #407887)
+- fix handling boolean parameters in powerLILO( bnc #383287)
+- exit as soon as possible if user request skip updating bootloader
+  (bnc #425501)
+- fix permission for directory with script for kernel-update
+- use udevadm info instead of udevinfo (patch by ro)
+- 0.4.72



Old:
----
  perl-Bootloader-0.4.71.tar.bz2
  perl-Bootloader-udevadm.patch

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

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

Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.N15861/_old	2008-09-26 16:55:05.000000000 +0200
+++ /var/tmp/diff_new_pack.N15861/_new	2008-09-26 16:55:05.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package perl-Bootloader (Version 0.4.71)
+# spec file for package perl-Bootloader (Version 0.4.72)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,8 @@
 
 
 Name:           perl-Bootloader
-Version:        0.4.71
-Release:        2
+Version:        0.4.72
+Release:        1
 Requires:       perl-base = %{perl_version}
 Requires:       e2fsprogs
 Recommends:     perl-gettext
@@ -31,7 +31,6 @@
 Source:         perl-Bootloader-%{version}.tar.bz2
 Source1:        update-bootloader
 Source2:        bootloader_entry
-Patch:          perl-Bootloader-udevadm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore: mdadm e2fsprogs limal-bootloader
 
@@ -50,7 +49,6 @@
 
 %prep
 %setup -q
-%patch
 
 %build
 touch Makefile.PL
@@ -62,7 +60,7 @@
 %perl_process_packlist
 mkdir -p $RPM_BUILD_ROOT/sbin
 install -m 755 %_sourcedir/update-bootloader $RPM_BUILD_ROOT/sbin
-install -d -m 711 $RPM_BUILD_ROOT/usr/lib/bootloader
+install -d -m 755 $RPM_BUILD_ROOT/usr/lib/bootloader
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader
 
 %files
@@ -76,8 +74,14 @@
 /usr/lib/bootloader
 
 %changelog
-* Thu Sep 25 2008 ro@suse.de
-- use udevadm info instead of udevinfo
+* Fri Sep 26 2008 jreidinger@suse.cz
+- add password generator for grub (bnc #407887)
+- fix handling boolean parameters in powerLILO( bnc #383287)
+- exit as soon as possible if user request skip updating bootloader
+  (bnc #425501)
+- fix permission for directory with script for kernel-update
+- use udevadm info instead of udevinfo (patch by ro)
+- 0.4.72
 * Fri Sep 19 2008 jreidinger@suse.cz
 - doesn't allow change between default and xen kernel during
   install (bnc #397075)

++++++ bootloader_entry ++++++
--- perl-Bootloader/bootloader_entry	2008-09-19 15:56:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/perl-Bootloader/bootloader_entry	2008-09-26 16:43:15.509857000 +0200
@@ -63,9 +63,9 @@
         echo "bootloader_entry: This is (wrapper) function update_bootloader" >> $logname
 
 	[ -x /sbin/update-bootloader ] || return 0
-	    # call update-bootloader and also append stderr to the log file
-	    ((/sbin/update-bootloader "$@") 3>&1 1>&2 2>&3 3>&- | tee -a \
-	    $logname ) 3>&1 1>&2 2>&3 3>&-
+
+	# call update-bootloader and also append stderr to the log file
+	/sbin/update-bootloader "$@") 1>>$logname 2>&1
 }
 
 

++++++ perl-Bootloader-0.4.71.tar.bz2 -> perl-Bootloader-0.4.72.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.71/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.4.72/lib/Bootloader/Core/GRUB.pm
--- old/perl-Bootloader-0.4.71/lib/Bootloader/Core/GRUB.pm	2008-09-18 13:35:48.000000000 +0200
+++ new/perl-Bootloader-0.4.72/lib/Bootloader/Core/GRUB.pm	2008-09-26 15:13:50.000000000 +0200
@@ -481,12 +481,12 @@
     }
 
     # resolve symlinks.....
-    my $cmd = "udevinfo  -q name -n $dev";
+    my $cmd = "udevadm info  -q name -n $dev";
     if (my $resolved_link = qx{$cmd 2> /dev/null}) {
 	chomp ($resolved_link);
 	$dev = "/dev/" . $resolved_link; 
     }
-    $self->l_milestone ("GRUB::GrubDev2UnixDev: udevinfo returned: $dev");
+    $self->l_milestone ("GRUB::GrubDev2UnixDev: udevadm info returned: $dev");
 
     if (defined ($partition)) {
 	foreach my $dev_ref (@{$self->{"partitions"}}) {
@@ -544,7 +544,7 @@
     # need to be changed here 
     my $original = $dev;
     my $kernel_dev;
-    my $cmd = "udevinfo  -q name -n $dev";
+    my $cmd = "udevadm info  -q name -n $dev";
     if ($kernel_dev = qx{$cmd 2> /dev/null}) {
 	chomp $kernel_dev;
 	$kernel_dev = "/dev/" . $kernel_dev;
@@ -574,8 +574,8 @@
     }
 
     # get the symbolic link from udev, it might be used in device.map
-    # udevinfo returns a space separated list of strings
-    $cmd = "udevinfo  -q symlink -n $kernel_dev";
+    # udevadm info returns a space separated list of strings
+    $cmd = "udevadm info  -q symlink -n $kernel_dev";
 
     my @udev_links = split (/ /, qx{$cmd 2>/dev/null});
 
@@ -2249,7 +2249,7 @@
 
     #FIXME: sf@ need handling for /dev/dm-X devices here
     if ($device !~ /mapper/) {
-	my $cmd = "udevinfo  -q symlink -n $device";
+	my $cmd = "udevadm info  -q symlink -n $device";
 	my @udev_links = split (/ /, qx{$cmd 2>/dev/null});
 
 	foreach $device (@udev_links) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.71/lib/Bootloader/Core/PowerLILO.pm new/perl-Bootloader-0.4.72/lib/Bootloader/Core/PowerLILO.pm
--- old/perl-Bootloader-0.4.71/lib/Bootloader/Core/PowerLILO.pm	2008-08-15 10:07:23.000000000 +0200
+++ new/perl-Bootloader-0.4.72/lib/Bootloader/Core/PowerLILO.pm	2008-09-23 13:04:17.000000000 +0200
@@ -710,7 +710,20 @@
           $ret{"append"} = $val if $val ne "";
           next;
         }
-	$ret{$key} = $line_ref->{"value"};
+        my ($stype) = undef;
+        if (defined $ret{"type"})
+        {
+          ($stype) = split /:/, $self->{"exports"}{"section_options"}->{$ret{"type"} . "_" . $key} || ""; 
+        }
+	# bool values appear in a config file or not
+	if (defined $stype and $stype eq "bool")
+        {
+	  $ret{$key} = "true";
+	}
+        else
+        {
+          $ret{$key} = $line_ref->{"value"};
+        }
     }
     $ret{"__lines"} = \@lines;
     return \%ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.71/lib/Bootloader/Library.pm new/perl-Bootloader-0.4.72/lib/Bootloader/Library.pm
--- old/perl-Bootloader-0.4.71/lib/Bootloader/Library.pm	2008-09-19 15:43:23.000000000 +0200
+++ new/perl-Bootloader-0.4.72/lib/Bootloader/Library.pm	2008-09-19 16:57:20.000000000 +0200
@@ -946,6 +946,19 @@
    return $res;
 }
 
+sub CountGRUBPassword{
+  my $self = shift;
+  my $pass = shift;
+  my $res = qx{echo "md5crypt \
+  $pass" | grub --batch | grep Encrypted };
+  $res =~ s/Encrypted:\s+(.*)$/$1/;
+  $self->{"loader"}->l_milestone("Library::CountGRUBPassword result $res" )
+      if (defined $self->{"loader"});
+  return undef unless $res =~ m/^\$1\$.*\$.*$/;
+  return $res;
+
+}
+
 1;
 
 #
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.71/lib/Bootloader/Tools.pm new/perl-Bootloader-0.4.72/lib/Bootloader/Tools.pm
--- old/perl-Bootloader-0.4.71/lib/Bootloader/Tools.pm	2008-09-18 09:52:14.000000000 +0200
+++ new/perl-Bootloader-0.4.72/lib/Bootloader/Tools.pm	2008-09-26 15:13:50.000000000 +0200
@@ -241,7 +241,7 @@
       $mounted = `mount /sys`;
     }
     # FIXME: maybe useless code  
-    my $cmd = "udevinfo -q name -p /block/$udev";
+    my $cmd = "udevadm info -q name -p /block/$udev";
     my $dev = qx{ $cmd 2>/dev/null };
     chomp ($dev);
 
@@ -249,7 +249,7 @@
         $dev = "/dev/$dev";
     }
 
-    # Fallback in case udevinfo fails
+    # Fallback in case udevadm info fails
     else {
 
 	#If $udev consists of both device and partition - e.g. "sda/sda1" -
@@ -654,7 +654,7 @@
 
 =item
 C<< $majmin = Bootloader::Tools::Udev2MajMin($udev); >>
-takes a udev device as reported from udevinfo
+takes a udev device as reported from udevadm info
 returns a string containing major:minor
 
 =cut
@@ -663,7 +663,7 @@
 
     my $udev_dev = shift;
     my $majmin;
-    my $cmd = "udevinfo -qpath -n $udev_dev";
+    my $cmd = "udevadm info -qpath -n $udev_dev";
 
     if (my $udev_path = qx{$cmd 2>/dev/null}){
        chomp ($udev_path);
@@ -682,9 +682,9 @@
 
 =item
 C<< $udev_dev = Bootloader::Tools::MajMin2Udev($majmin); >>
-takes a string major:minor as reported from udevinfo
+takes a string major:minor as reported from udevadm info
 returns a string containing the udev device as reported 
-by udevinfo
+by udevadm info
 
 =cut
 
@@ -741,7 +741,7 @@
 
 =item
 C<< $dm_dev = Bootloader::Tools::DMDev2MajMin($majmin); >>
-takes a string major:minor as reported from udevinfo
+takes a string major:minor as reported from udevadm info
 returns a string containing the device as reported by 
 dmsetup
 

++++++ update-bootloader ++++++
--- perl-Bootloader/update-bootloader	2008-09-19 15:56:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/perl-Bootloader/update-bootloader	2008-09-26 16:43:15.460893000 +0200
@@ -209,6 +209,15 @@
 
 pod2usage("Option 'force-default' is only allowed for operation 'add'")
     if ($opt_force_default and not defined $oper{add});
+    
+if (Bootloader::Tools::GetBootloader() eq "none")
+{
+  open (LOG, ">>$logname");
+  print LOG ("none bootloader, skipped updating \n");
+  close LOG;
+  
+  exit 0;
+}
 
 if ($opt_image and $opt_image !~ m;^/;) {
     $opt_image = getcwd . '/' . $opt_image
@@ -500,7 +509,8 @@
 }
 
 if (defined $oper{refresh}) {
-    UpdateBootloader();
+    my $ret = UpdateBootloader();
+    exit 1 if ( !$ret );
 }
 
 #


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



Remember to have fun...

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

    

root＠Hilbert.suse.de

tags

participants (1)