diff --git a/bootloader_entry b/bootloader_entry index d778578..54f0251 100644 --- a/bootloader_entry +++ b/bootloader_entry @@ -100,21 +100,28 @@ function add_entry() -f $PERL_BOOTLOADER_TESTSUITE_PATH/etc/lilo.conf -o \ -f $PERL_BOOTLOADER_TESTSUITE_PATH/etc/elilo.conf -o \ -f $PERL_BOOTLOADER_TESTSUITE_PATH/etc/zipl.conf ]; then + default="" + if test ! "$PBL_AUTOTEST"; then + default="--default" + fi + case $flavor in (kdump|um) ;; (xen*) opt_xen_kernel= - set -- $flavor - set -- ${1#xen} - opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz + if [ -e /proc/xen/xsd_port -o ! -e /proc/xen ]; then + set -- $flavor + set -- ${1#xen} + opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz + fi if [ "$forcedefault" == "force-default" ]; then # Add the new bootloader entry (xen kernel) # and force it beeing the default entry update_bootloader --image /boot/$image \ --initrd /boot/$initrd \ - --default \ + $default \ --force-default \ --add \ --force $opt_xen_kernel \ @@ -124,7 +131,7 @@ function add_entry() # Add the new bootloader entry (xen kernel) update_bootloader --image /boot/$image \ --initrd /boot/$initrd \ - --default \ + $default \ --add \ --force $opt_xen_kernel \ --name "$release" \ @@ -176,7 +183,7 @@ function add_entry() # Add the new bootloader entry update_bootloader --image /boot/$image \ --initrd /boot/$initrd \ - --default \ + $default \ --add \ --force \ --name "$release" \ @@ -242,7 +249,7 @@ function remove_entry() # thus do not match either. (#223030) - if [[ "$flavor" =~ xen ]]; then + if [[ "$flavor" =~ xen ]] && [ -e /proc/xen/xsd_port -o ! -e /proc/xen ]; then update_bootloader --image /boot/$image \ --initrd /boot/$initrd \ --xen \ diff --git a/perl-Bootloader-0.4.83.tar.bz2 b/perl-Bootloader-0.4.83.tar.bz2 deleted file mode 100644 index 6d4e6d0..0000000 --- a/perl-Bootloader-0.4.83.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4f03ac7d6d79065797bfa6e416fab7f3813561693dc1571d06f2a297930ee9d -size 55542 diff --git a/perl-Bootloader-0.4.90.tar.bz2 b/perl-Bootloader-0.4.90.tar.bz2 new file mode 100644 index 0000000..952d7fb --- /dev/null +++ b/perl-Bootloader-0.4.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3efa1ddb0e608a50b62d6bb9277e282a802701660135023da9f71193b8bf6b2e +size 55773 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index 82531c1..1964cb3 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,9 +1,56 @@ +------------------------------------------------------------------- +Mon Mar 9 14:13:44 CET 2009 - jreidinger@suse.cz + +- allow disabling changing default for testing purpose +- 0.4.90 + +------------------------------------------------------------------- +Tue Feb 24 12:19:06 CET 2009 - jreidinger@suse.cz + +- also remove bootloader section properly in XEN guest (bnc#478365) +- 0.4.89 + +------------------------------------------------------------------- +Mon Feb 23 15:00:43 CET 2009 - jsrain@suse.cz + +- add bootloader section properly in XEN guest (bnc#478365) +- 0.4.88 + +------------------------------------------------------------------- +Thu Feb 5 14:07:43 CET 2009 - jreidinger@suse.cz + +- proper detect of multipath with user friendly names (bnc#468792) +- 0.4.87 + +------------------------------------------------------------------- +Mon Jan 26 08:51:34 CET 2009 - jreidinger@suse.cz + +- avoid multipath hang (but not properly fixed as it need more + testing in this phase(bnc #468792) +- avoid non-exist default (bnc #469314) +- 0.4.86 + +------------------------------------------------------------------- +Tue Jan 20 15:56:50 CET 2009 - jreidinger@suse.cz + +- parse correctly multiline entries (bnc #466250) +- 0.4.85 + +------------------------------------------------------------------- +Mon Jan 19 16:33:06 CET 2009 - jreidinger@suse.cz + +- filter out initrd with empty value (bnc #465148) +- doesn't output any warnings to console even if storage have empty + mount points map (happen during autoyast setup) (bnc #464098) +- 0.4.84 + ------------------------------------------------------------------- Thu Jan 8 14:03:36 CET 2009 - jreidinger@suse.cz - fix chomping of dmsetup output (bnc #463451) - fix translating udev dmraid device (bnc #445602) - 0.4.83 + ------------------------------------------------------------------- Thu Dec 18 09:25:45 CET 2008 - jreidinger@suse.cz diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index c1d2081..a25184f 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.83) +# spec file for package perl-Bootloader (Version 0.4.90) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: perl-Bootloader -Version: 0.4.83 +Version: 0.4.90 Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs @@ -81,6 +81,31 @@ install -m 644 update-Bootloader.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/ /boot/boot.readme %changelog +* Mon Mar 09 2009 jreidinger@suse.cz +- allow disabling changing default for testing purpose +- 0.4.90 +* Tue Feb 24 2009 jreidinger@suse.cz +- also remove bootloader section properly in XEN guest (bnc#478365) +- 0.4.89 +* Mon Feb 23 2009 jsrain@suse.cz +- add bootloader section properly in XEN guest (bnc#478365) +- 0.4.88 +* Thu Feb 05 2009 jreidinger@suse.cz +- proper detect of multipath with user friendly names (bnc#468792) +- 0.4.87 +* Mon Jan 26 2009 jreidinger@suse.cz +- avoid multipath hang (but not properly fixed as it need more + testing in this phase(bnc #468792) +- avoid non-exist default (bnc #469314) +- 0.4.86 +* Tue Jan 20 2009 jreidinger@suse.cz +- parse correctly multiline entries (bnc #466250) +- 0.4.85 +* Mon Jan 19 2009 jreidinger@suse.cz +- filter out initrd with empty value (bnc #465148) +- doesn't output any warnings to console even if storage have empty + mount points map (happen during autoyast setup) (bnc #464098) +- 0.4.84 * Thu Jan 08 2009 jreidinger@suse.cz - fix chomping of dmsetup output (bnc #463451) - fix translating udev dmraid device (bnc #445602)