From 2d6eaa85f5f88b52071e77e094f6f5ae93cee0486bfb2ac08c4ab8d6e3c14aac Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Tue, 20 Oct 2015 14:57:13 +0000 Subject: [PATCH 1/2] - do not modify bootloader configuration during offlien upgrade from grub2 to grub2 (bnc#950695,bnc#950162) - 3.1.158 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=593 --- yast2-bootloader-3.1.157.tar.bz2 | 3 --- yast2-bootloader-3.1.158.tar.bz2 | 3 +++ yast2-bootloader.changes | 7 +++++++ yast2-bootloader.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 yast2-bootloader-3.1.157.tar.bz2 create mode 100644 yast2-bootloader-3.1.158.tar.bz2 diff --git a/yast2-bootloader-3.1.157.tar.bz2 b/yast2-bootloader-3.1.157.tar.bz2 deleted file mode 100644 index fc4abfa..0000000 --- a/yast2-bootloader-3.1.157.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:821d630065c3824876bd967156e042973912613bd1cdfc1f1687242223ae0559 -size 330558 diff --git a/yast2-bootloader-3.1.158.tar.bz2 b/yast2-bootloader-3.1.158.tar.bz2 new file mode 100644 index 0000000..5c302b6 --- /dev/null +++ b/yast2-bootloader-3.1.158.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ba3820d2a8016c7fd703b517ed2699538ff1641ce37e1f1fb51e39deb3b7ccb +size 330324 diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index 9a5e58c..9749c80 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 19 16:10:34 UTC 2015 - jreidinger@suse.com + +- do not modify bootloader configuration during offlien upgrade + from grub2 to grub2 (bnc#950695,bnc#950162) +- 3.1.158 + ------------------------------------------------------------------- Fri Oct 16 14:27:17 CEST 2015 - schubi@suse.de diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index 8478560..5a4bf8d 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.157 +Version: 3.1.158 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build From c38a457cdd06b810c034a143ccb1d8b3e8727a79a6e79c9b7b3b2e43aa4e73fe Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Fri, 23 Oct 2015 13:33:17 +0000 Subject: [PATCH 2/2] - respect original grub2 configuration when upgrade from grub2 to grub2 (bnc#951731) - 3.1.159 - do not modify bootloader configuration during offline upgrade OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=594 --- yast2-bootloader-3.1.158.tar.bz2 | 3 --- yast2-bootloader-3.1.159.tar.bz2 | 3 +++ yast2-bootloader.changes | 9 ++++++++- yast2-bootloader.spec | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 yast2-bootloader-3.1.158.tar.bz2 create mode 100644 yast2-bootloader-3.1.159.tar.bz2 diff --git a/yast2-bootloader-3.1.158.tar.bz2 b/yast2-bootloader-3.1.158.tar.bz2 deleted file mode 100644 index 5c302b6..0000000 --- a/yast2-bootloader-3.1.158.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ba3820d2a8016c7fd703b517ed2699538ff1641ce37e1f1fb51e39deb3b7ccb -size 330324 diff --git a/yast2-bootloader-3.1.159.tar.bz2 b/yast2-bootloader-3.1.159.tar.bz2 new file mode 100644 index 0000000..8f84099 --- /dev/null +++ b/yast2-bootloader-3.1.159.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e4ff1b845b8395673644a2e55bac41e983a3b7b41172df94f7ed4617d2df520 +size 330506 diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index 9749c80..1d3aabb 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 23 13:16:59 UTC 2015 - jreidinger@suse.com + +- respect original grub2 configuration when upgrade from grub2 + to grub2 (bnc#951731) +- 3.1.159 + ------------------------------------------------------------------- Mon Oct 19 16:10:34 UTC 2015 - jreidinger@suse.com -- do not modify bootloader configuration during offlien upgrade +- do not modify bootloader configuration during offline upgrade from grub2 to grub2 (bnc#950695,bnc#950162) - 3.1.158 diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index 5a4bf8d..9c21dd1 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.158 +Version: 3.1.159 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build