Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2012-02-21 12:16:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2011-10-26 15:34:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-02-21 12:16:47.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 13 17:52:57 CET 2012 - [email protected] + +- fixed return value of rccobblerd status + +------------------------------------------------------------------- +Mon Feb 13 10:45:06 UTC 2012 - [email protected] + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Thu Dec 22 13:23:01 CET 2011 - [email protected] + +- fix install=... kernel option when you import a SUSE distro + +------------------------------------------------------------------- New: ---- fix_suse_import.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.X26IHi/_old 2012-02-21 12:16:48.000000000 +0100 +++ /var/tmp/diff_new_pack.X26IHi/_new 2012-02-21 12:16:48.000000000 +0100 @@ -22,7 +22,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Summary: Boot server configurator Name: cobbler -License: GPLv2+ +License: GPL-2.0+ Version: 2.2.1 Release: 6 Source0: cobbler-%{version}.tar.gz @@ -33,6 +33,7 @@ Patch13: users_patch.diff Patch14: setup_py.diff Patch15: virt-auto-boot.diff +Patch20: fix_suse_import.diff Group: Applications/System Requires: python >= 2.3 @@ -124,6 +125,7 @@ %patch13 %patch14 %patch15 -p1 +%patch20 mv vendor-files/cobbler.1.gz docs %build ++++++ fix-initscript.dif ++++++ --- /var/tmp/diff_new_pack.X26IHi/_old 2012-02-21 12:16:48.000000000 +0100 +++ /var/tmp/diff_new_pack.X26IHi/_new 2012-02-21 12:16:48.000000000 +0100 @@ -1,5 +1,5 @@ --- config/cobblerd -+++ config/cobblerd 2011/10/07 14:35:57 ++++ config/cobblerd 2012/02/13 16:50:58 @@ -7,8 +7,9 @@ ### BEGIN INIT INFO @@ -60,7 +60,15 @@ rm -f /var/run/$SERVICE.pid fi } -@@ -125,7 +146,7 @@ +@@ -111,6 +132,7 @@ + echo -n "Checking for service cobblerd " + checkproc /usr/bin/cobblerd + rc_status -v ++ RETVAL=$? + elif [ -f $DEBIAN_VERSION ]; then + if [ -f $LOCKFILE ]; then + RETVAL=0 +@@ -125,7 +147,7 @@ fi ;; condrestart) ++++++ fix_suse_import.diff ++++++ --- cobbler/modules/manage_import_suse.py +++ cobbler/modules/manage_import_suse.py 2011/12/22 12:22:40 @@ -476,7 +476,7 @@ distro.set_initrd(initrd) distro.set_arch(pxe_arch) distro.set_breed(self.breed) - distro.set_kernel_options("install=http://@@http_server@@/cblr/links/%s"; % (name)) + distro.set_kernel_options("install=http://%s/cblr/links/%s"; % (self.settings.server, name)) # If a version was supplied on command line, we set it now if self.os_version: distro.set_os_version(self.os_version) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
