Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2014-09-12 11:28:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler" Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2014-08-03 15:37:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2014-09-12 12:22:57.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 4 09:43:01 UTC 2014 - [email protected] + +- Added do_not_use_grubby_compat_when_grub2_is_in_use.diff: prevents + usage of grubby-compat when grub2 is active. Use grub2 features + do modify the boot loader. + +------------------------------------------------------------------- +Tue Sep 2 15:08:40 UTC 2014 - [email protected] + +- Moved grubby-compat inside of the koan sub-package. The scrit was accidentally + moved into the cobbler package. + +------------------------------------------------------------------- New: ---- do_not_use_grubby_compat_when_grub2_is_in_use.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.9wzB3p/_old 2014-09-12 12:22:58.000000000 +0200 +++ /var/tmp/diff_new_pack.9wzB3p/_new 2014-09-12 12:22:58.000000000 +0200 @@ -58,6 +58,7 @@ Patch11: fix-powermanagement-status.dif Patch12: bnc_877009.patch Patch13: fix_sle_detection.patch +Patch14: do_not_use_grubby_compat_when_grub2_is_in_use.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -67,10 +68,10 @@ BuildRequires: git BuildRequires: python-cheetah %if 0%{?suse_version} -BuildRequires: python-PyYAML -BuildRequires: distribution-release -BuildRequires: atftp BuildRequires: apache2 +BuildRequires: atftp +BuildRequires: distribution-release +BuildRequires: python-PyYAML Requires: apache2-mod_wsgi Requires: ipmitool %else @@ -163,6 +164,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 mv vendor-files/cobbler.1.gz docs @@ -404,7 +406,6 @@ %config /etc/apache2/vhosts.d/cobbler_web.conf %config /etc/sysconfig/SuSEfirewall2.d/cobbler /usr/sbin/fence_ipmitool -/usr/sbin/grubby-compat /usr/sbin/rccobblerd %endif @@ -434,6 +435,9 @@ %{_bindir}/ovz-install %{_bindir}/cobbler-register %{python_sitelib}/koan +%if 0%{?suse_version} +%attr(0755,root,root) /usr/sbin/grubby-compat +%endif %if 0%{?fedora} >= 9 || 0%{?rhel} >= 5 || 0%{?suse_version} %exclude %{python_sitelib}/koan/sub_process.py* ++++++ do_not_use_grubby_compat_when_grub2_is_in_use.diff ++++++ diff --git a/koan/app.py b/koan/app.py index a732309..4a125f8 100644 --- a/koan/app.py +++ b/koan/app.py @@ -1042,9 +1042,12 @@ class Koan: raise InfoException, "grub2 is not installed" use_grub2 = True elif (make == "suse"): - if not os.path.exists("/usr/sbin/grubby-compat"): - raise InfoException, "grub2 is not installed" - use_grubby_compat = True + if os.path.exists("/usr/sbin/grub2-install"): + use_grub2 = True + else: + if not os.path.exists("/usr/sbin/grubby-compat"): + raise InfoException, "grubby-compat is not installed" + use_grubby_compat = True else: if not os.path.exists("/sbin/grubby"): raise InfoException, "grubby is not installed" @@ -1175,10 +1178,13 @@ class Koan: # Set paths for Ubuntu/Debian # TODO: Add support for other distros when they ship grub2 - if make in ['ubuntu', 'debian']: + if make in ['ubuntu', 'debian', 'suse']: grub_file = "/etc/grub.d/42_koan" grub_default_file = "/etc/default/grub" - cmd = ["update-grub"] + if make in ['suse']: + cmd = ['/sbin/update-bootloader', '--refresh'] + else: + cmd = ["update-grub"] default_cmd = ['sed', '-i', 's/^GRUB_DEFAULT\=.*$/GRUB_DEFAULT="%s"/g' % name, grub_default_file] # Create grub2 menuentry -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
