diff --git a/perl-Bootloader-0.4.16.tar.bz2 b/perl-Bootloader-0.4.16.tar.bz2 deleted file mode 100644 index 82368be..0000000 --- a/perl-Bootloader-0.4.16.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c1f952466cc7755cbb0b1d823c72b6ca04dfd61945f820f459ecd22d988f8f2 -size 45360 diff --git a/perl-Bootloader-0.4.17.tar.bz2 b/perl-Bootloader-0.4.17.tar.bz2 new file mode 100644 index 0000000..a237465 --- /dev/null +++ b/perl-Bootloader-0.4.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ac2d79d0ce20e1bf7177de801caed92ad701eb9bb53e0b926212c42a453be03 +size 46618 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index ecf5d75..6d9f20b 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Fri Jul 6 10:39:13 CEST 2007 - aosthof@suse.de + +- Version bump to 0.4.17 + +------------------------------------------------------------------- +Fri Jul 6 10:36:01 CEST 2007 - aosthof@suse.de + +- Fixed default value handling in update-bootloader. Check if + default image is a symlink. If this is the case, let the new + kernel be the default one. Else, if the flavor is the same as the + one of the new kernel, let the new kernel become the default + one. (#276923) + +------------------------------------------------------------------- +Fri Jul 6 10:32:48 CEST 2007 - aosthof@suse.de + +- Fixed resolution of kernel and initrd symlinks in Tools.pm + (#276923) + +------------------------------------------------------------------- +Fri Jul 6 10:31:45 CEST 2007 - aosthof@suse.de + +- Implemented a special handling to make sure that all image + sections are referenced at least in the base menu (#266605) + +------------------------------------------------------------------- +Fri Jul 6 10:30:42 CEST 2007 - aosthof@suse.de + +- Fixed function FixSectionName() in ZIPL.pm to fix section names + on s390 properly (also related to #284308) + +------------------------------------------------------------------- +Fri Jul 6 10:29:55 CEST 2007 - aosthof@suse.de + +- implement FixSectionName funtion for ZIPL module according to the + zipl sources (#267866) +- adjust inline interface documentation accordingly + +------------------------------------------------------------------- +Fri Jul 6 10:26:42 CEST 2007 - aosthof@suse.de + +- Removed an "o" suffix from a perl s/foo/bar/ expression that it + gets compiled every time, not only once. This enables section + names to get fixed properly. (related to ##284308) + +------------------------------------------------------------------- +Fri Jul 6 10:25:06 CEST 2007 - aosthof@suse.de + +- Removed a line in update-bootloader which replaced spaces by + underscores, because this functionality is done by + FixSectionName() in the according bootloader modules (#284308) + +------------------------------------------------------------------- +Fri Jul 6 10:23:05 CEST 2007 - aosthof@suse.de + +- Corrected naming scheme for boot entry labels to display long + ones in case of GRUB and short ones for all other loaders + (#277405) + +------------------------------------------------------------------- +Fri Jul 6 10:20:03 CEST 2007 - aosthof@suse.de + +- detect wether we have an entry with non existing initrd (#276923) + ------------------------------------------------------------------- Mon Jul 2 14:29:10 CEST 2007 - aosthof@suse.de diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index 925674b..80e7854 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.16) +# spec file for package perl-Bootloader (Version 0.4.17) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,8 +11,8 @@ # norootforbuild Name: perl-Bootloader -Version: 0.4.16 -Release: 9 +Version: 0.4.17 +Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext Requires: mdadm e2fsprogs @@ -66,6 +66,41 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader /usr/lib/bootloader %changelog +* Fri Jul 06 2007 - aosthof@suse.de +- Version bump to 0.4.17 +* Fri Jul 06 2007 - aosthof@suse.de +- Fixed default value handling in update-bootloader. Check if + default image is a symlink. If this is the case, let the new + kernel be the default one. Else, if the flavor is the same as the + one of the new kernel, let the new kernel become the default + one. (#276923) +* Fri Jul 06 2007 - aosthof@suse.de +- Fixed resolution of kernel and initrd symlinks in Tools.pm + (#276923) +* Fri Jul 06 2007 - aosthof@suse.de +- Implemented a special handling to make sure that all image + sections are referenced at least in the base menu (#266605) +* Fri Jul 06 2007 - aosthof@suse.de +- Fixed function FixSectionName() in ZIPL.pm to fix section names + on s390 properly (also related to #284308) +* Fri Jul 06 2007 - aosthof@suse.de +- implement FixSectionName funtion for ZIPL module according to the + zipl sources (#267866) +- adjust inline interface documentation accordingly +* Fri Jul 06 2007 - aosthof@suse.de +- Removed an "o" suffix from a perl s/foo/bar/ expression that it + gets compiled every time, not only once. This enables section + names to get fixed properly. (related to ##284308) +* Fri Jul 06 2007 - aosthof@suse.de +- Removed a line in update-bootloader which replaced spaces by + underscores, because this functionality is done by + FixSectionName() in the according bootloader modules (#284308) +* Fri Jul 06 2007 - aosthof@suse.de +- Corrected naming scheme for boot entry labels to display long + ones in case of GRUB and short ones for all other loaders + (#277405) +* Fri Jul 06 2007 - aosthof@suse.de +- detect wether we have an entry with non existing initrd (#276923) * Mon Jul 02 2007 - aosthof@suse.de - Removed require for limal-bootloader in .spec due to drop of limal-bootloader package in openSUSE 10.3 diff --git a/update-bootloader b/update-bootloader index 8cde775..856ad58 100644 --- a/update-bootloader +++ b/update-bootloader @@ -128,7 +128,6 @@ sub GetProduct { if ($found){ if ($loader ne "grub") { $namever = $product_query[$i+1]; - $namever =~ s/\s/_/; } else{ $namever = $product_query[$i+2]; @@ -293,10 +292,17 @@ if (defined $oper{add}) { $flavor =~ s/.*-(\w+)/\1/; $flavor = ucfirst ($flavor); - my $version = $opt_name; - $version =~ s/-[^-]*$//; + # Create long labels for grub + if ($loader eq "grub") { + my $version = $opt_name; + $version =~ s/-[^-]*$//; - $opt_name = $flavor . " -- " . GetProduct() . " - " . $version; + $opt_name = $flavor . " -- " . GetProduct() . " - " . $version; + } + # Create short labels for all other loaders + else { + $opt_name = $flavor; + } } } @@ -316,15 +322,26 @@ if (defined $oper{add}) { pod2usage("There are already sections with image '$opt_image'"); } } else { - # FIXME: Subject of change (depending on how the weather is) - # only add default if "appropriate" - # meaning now flavor of current default matches new one - #my $flavor = GetDefaultImage(); - #$flavor =~ s/^.*-//; - # - #if ($opt_image =~ m/.*-${flavor}$/) { - # push @params, default => $opt_default; - #} + my $default_image = GetDefaultImage(); + + # Check if default image is a symlink. If this is the case, let the new + # kernel be the default one. + if (-l $default_image) { + $default_image = readlink ($default_image); + push @params, default => $opt_default; + } + + # Else, find out the flavor of the default kernel. If it is the same + # flavor as the one of the new kernel, let the new kernel be the + # default one. + else { + $default_image =~ s/^.*-//; + + if ($opt_image =~ m/.*-${default_image}$/) { + push @params, default => $opt_default; + } + } + push @params, xen => $opt_xen_kernel if $type eq "xen"; push @params, initrd => $opt_initrd if $opt_initrd;