Hello community, here is the log from the commit of package insserv for openSUSE:Factory checked in at 2012-12-12 13:10:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/insserv (Old) and /work/SRC/openSUSE:Factory/.insserv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "insserv", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/insserv/insserv.changes 2012-11-26 18:58:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.insserv.new/insserv.changes 2012-12-12 13:10:53.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Dec 12 11:32:24 UTC 2012 - [email protected] + +- boot.crypto is handled by systemd +- syslogger is always up with systemd as it's keeping it in the + journal till the syslog is up, so there is no point in relying on + it + +------------------------------------------------------------------- +Wed Dec 12 11:25:11 UTC 2012 - [email protected] + +- do not buildrequire systemd, systemd-mini is enough + +------------------------------------------------------------------- +Wed Dec 12 11:07:16 UTC 2012 - [email protected] + +- do not use FATAL at all for -DOSCBUILD - which I abuse now as + "systemd support only": + insserv-1.16.0-noerror.diff + +------------------------------------------------------------------- New: ---- insserv-1.16.0-noerror.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.ihOQMH/_old 2012-12-12 13:10:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ihOQMH/_new 2012-12-12 13:10:54.000000000 +0100 @@ -18,9 +18,9 @@ Name: insserv Provides: aaa_base:/sbin/insserv -BuildRequires: dbus-1-devel BuildRequires: pkg-config -BuildRequires: systemd-devel +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(systemd) Version: 1.16.0 Release: 0 Summary: A Program to Arrange Initialization Scripts @@ -30,6 +30,7 @@ Source0: http://download.savannah.gnu.org/releases/sysvinit/insserv-%{version}.tar.bz2 Source1: insserv.conf Patch: insserv-%{version}.dif +Patch1: insserv-1.16.0-noerror.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _sbindir /sbin @@ -49,6 +50,7 @@ %prep %setup %patch +%patch1 -p1 %build # It seems that the build system will not go to be fix ++++++ insserv-1.16.0-noerror.diff ++++++ Index: insserv-1.16.0/insserv.c =================================================================== --- insserv-1.16.0.orig/insserv.c +++ insserv-1.16.0/insserv.c @@ -502,12 +502,20 @@ static boolean chkrequired(service_t *re must->attr.flags |= SERV_ENFORCE; continue; /* Enabled this later even if not on command line */ } +#ifdef OSCBUILD + if ((must->attr.flags & SERV_WARNED) == 0) { + warn("service %s has to be enabled to use service %s\n", + req->serv->name, serv->name); + must->attr.flags |= SERV_WARNED; + } +#else if ((must->attr.flags & SERV_WARNED) == 0) { warn("FATAL: service %s has to be enabled to use service %s\n", req->serv->name, serv->name); must->attr.flags |= SERV_WARNED; } ret = false; +#endif } } #if 0 @@ -526,9 +534,14 @@ static boolean chkrequired(service_t *re must = rev->serv; must = getorig(must); if (must->attr.flags & (SERV_CMDLINE|SERV_ENABLED)) { +#ifdef OSCBUILD + warn("service %s has to be enabled to use service %s\n", + serv->name, rev->serv->name); +#else warn("FATAL: service %s has to be enabled to use service %s\n", serv->name, rev->serv->name); ret = false; +#endif } } #endif @@ -574,10 +587,14 @@ static boolean chkdependencies(service_t if ((cur->attr.flags & SERV_CMDLINE) && (flags & (SERV_CMDLINE|SERV_SYSTEMD))) continue; - +#ifdef OSCBUILD + warn("service %s has to be enabled to use service %s\n", + name, cur->name); +#else warn("FATAL: service %s has to be enabled to use service %s\n", name, cur->name); ret = false; +#endif } } return ret; ++++++ insserv.conf ++++++ --- /var/tmp/diff_new_pack.ihOQMH/_old 2012-12-12 13:10:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ihOQMH/_new 2012-12-12 13:10:54.000000000 +0100 @@ -1,7 +1,7 @@ # # All local filesystems are mounted (done during boot phase) # -$local_fs boot.localfs +boot.crypto +$local_fs boot.localfs # # Low level networking (ethernet card) @@ -23,7 +23,7 @@ # # System logger is operational # -$syslog syslog +$syslog +syslog # # SunRPC portmapper available -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
