From 035a3530275bd87b894f55aa346e4c5eec20d6e8a37ce71f9b3b3f0bf60c40be Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 7 Dec 2007 19:17:37 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-Bootloader?expand=0&rev=35 --- perl-Bootloader-0.4.39.tar.bz2 | 3 --- perl-Bootloader-0.4.41.tar.bz2 | 3 +++ perl-Bootloader.changes | 12 ++++++++++++ perl-Bootloader.spec | 10 ++++++++-- update-bootloader | 12 +++++++++--- 5 files changed, 32 insertions(+), 8 deletions(-) delete mode 100644 perl-Bootloader-0.4.39.tar.bz2 create mode 100644 perl-Bootloader-0.4.41.tar.bz2 diff --git a/perl-Bootloader-0.4.39.tar.bz2 b/perl-Bootloader-0.4.39.tar.bz2 deleted file mode 100644 index 182b8ad..0000000 --- a/perl-Bootloader-0.4.39.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27b14c58db801dfa42bacdb35f0004e26ad6ea538eeecd5a5ed3c4bedaf8d2bd -size 49332 diff --git a/perl-Bootloader-0.4.41.tar.bz2 b/perl-Bootloader-0.4.41.tar.bz2 new file mode 100644 index 0000000..b79a8f5 --- /dev/null +++ b/perl-Bootloader-0.4.41.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce67d4dfb449345198d92dd3ea468a9a370f3b4e97e5ff86d391c087794dfaf9 +size 49420 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index d9ce4fb..6382891 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Dec 7 17:22:00 CET 2007 - aosthof@suse.de + +- Distinguish between various xen kernel names (#340922) +- Version bump to 0.4.41 + +------------------------------------------------------------------- +Fri Dec 7 17:21:02 CET 2007 - aosthof@suse.de + +- Corrected mechanism of removing obsolete boot entries (#285421) +- Version bump to 0.4.40 + ------------------------------------------------------------------- Wed Dec 5 14:53:20 CET 2007 - aosthof@suse.de diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index 181da28..84331c0 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.39) +# spec file for package perl-Bootloader (Version 0.4.41) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Bootloader -Version: 0.4.39 +Version: 0.4.41 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -66,6 +66,12 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader /usr/lib/bootloader %changelog +* Fri Dec 07 2007 - aosthof@suse.de +- Distinguish between various xen kernel names (#340922) +- Version bump to 0.4.41 +* Fri Dec 07 2007 - aosthof@suse.de +- Corrected mechanism of removing obsolete boot entries (#285421) +- Version bump to 0.4.40 * Wed Dec 05 2007 - aosthof@suse.de - Fixed removal of xen (-pae) entries (#345188) - Version bump to 0.4.39 diff --git a/update-bootloader b/update-bootloader index d6dc920..6e32767 100644 --- a/update-bootloader +++ b/update-bootloader @@ -302,11 +302,17 @@ if (defined $oper{add}) { # Naming scheme for all xen kernels, thus xen and xenpae elsif ($opt_xen) { if ($loader eq "grub") { - $opt_name =~ s/-xen.*$//; - $opt_xen_name = "XEN -- " . GetProduct() . " - " . $opt_name; + my $opt_version = $opt_name; + $opt_version =~ s/-xen.*$//; + + $opt_name =~ s/^.*(xen.*)$/$1/; + $opt_name = ucfirst ($opt_name); + + $opt_xen_name = "$opt_name -- " . GetProduct() . " - " . $opt_name; } else { - $opt_name = "XEN"; + $opt_name =~ s/^.*(xen.*)$/$1/; + $opt_name = ucfirst ($opt_name); } } # Naming scheme for all other kernels