[Initscripts-ng-commits] r1111 - in /trunk/src/insserv/debian: changelog patches/230_systemd_on_linux.patch run-testsuite

[pere at users.alioth.debian.org]

Author: pere
Date: Wed Apr 16 20:42:32 2014
New Revision: 1111

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1111
Log:
Disable systemd integration completely until bug #738775 is properly
fixed.  Adjust 230_systemd_on_linux.patch and testsuite accordingly.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/230_systemd_on_linux.patch
    trunk/src/insserv/debian/run-testsuite

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1111&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog	(original)
+++ trunk/src/insserv/debian/changelog	Wed Apr 16 20:42:32 2014
@@ -1,3 +1,10 @@
+insserv (1.16.0-4) UNRELEASED; urgency=low
+
+  * Disable systemd integration completely until bug #738775 is properly
+    fixed.  Adjust 230_systemd_on_linux.patch and testsuite accordingly.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 16 Apr 2014 22:39:35 +0200
+
 insserv (1.16.0-3) experimental; urgency=low
 
   * Added patch 220_no_MAXSYMLINKS.patch to get source building on Hurd.

Modified: trunk/src/insserv/debian/patches/230_systemd_on_linux.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/230_systemd_on_linux.patch?rev=1111&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/230_systemd_on_linux.patch	(original)
+++ trunk/src/insserv/debian/patches/230_systemd_on_linux.patch	Wed Apr 16 20:42:32 2014
@@ -9,17 +9,18 @@
 
 Index: insserv/Makefile
 ===================================================================
---- insserv.orig/Makefile	2014-02-19 12:58:29.457954636 +0100
-+++ insserv/Makefile	2014-02-19 13:29:55.630204109 +0100
-@@ -15,6 +15,15 @@
+--- insserv.orig/Makefile	2014-04-16 22:36:50.190451216 +0200
++++ insserv/Makefile	2014-04-16 22:39:05.631291439 +0200
+@@ -15,6 +15,16 @@
  VERSION	 =	1.16.0
  DATE	 =	$(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]')
  CFLDBUS	 =	$(shell pkg-config --cflags dbus-1)
 +OS := $(shell uname -s)
 +
 +ifeq ($(OS),Linux)
-+SYSTEMD  =      -DUSE_SYSTEMD
-+SYSTEMDOBJ = systemd.o
++# Avoid systemd integration in Debian until #738775 is properly fixed.
++#SYSTEMD  =      -DUSE_SYSTEMD
++#SYSTEMDOBJ = systemd.o
 +else
 +SYSTEMD  =
 +SYSTEMDOBJ =
@@ -27,7 +28,7 @@
  
  #
  # Architecture
-@@ -29,7 +38,7 @@
+@@ -29,7 +39,7 @@
  	  COPTS ?= -g -O2
  endif
  endif
@@ -36,7 +37,7 @@
  		  $(ISSUSE) -DINITDIR=\"$(INITDIR)\" -DINSCONF=\"$(INSCONF)\" -pipe
  	  CLOOP = -falign-loops=0
  	LDFLAGS ?= -Wl,-O,3,--relax
-@@ -76,7 +85,7 @@
+@@ -76,7 +86,7 @@
  
  all:		$(TODO)
  
@@ -47,8 +48,8 @@
  listing.o:	listing.c listing.h config.h .system
 Index: insserv/insserv.c
 ===================================================================
---- insserv.orig/insserv.c	2014-02-19 12:58:29.585955472 +0100
-+++ insserv/insserv.c	2014-02-19 12:58:29.597955548 +0100
+--- insserv.orig/insserv.c	2014-04-16 22:36:50.322452040 +0200
++++ insserv/insserv.c	2014-04-16 22:36:50.334452107 +0200
 @@ -23,11 +23,13 @@
   *
   */

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=1111&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite	(original)
+++ trunk/src/insserv/debian/run-testsuite	Wed Apr 16 20:42:32 2014
@@ -12,9 +12,9 @@
 fi
 
 # Run tests without trying to talk to systemd
-if [ Linux = $(uname -s) ] ; then
-    insopts="-y /non-existing"
-fi
+#if [ Linux = $(uname -s) ] ; then
+#    insopts="-y /non-existing"
+#fi
 
 update_conf() {
 set +C
@@ -2420,9 +2420,9 @@
 test_cross_runlevel_dep() {
 
 initdir_purge
-if [ Linux = $(uname -s) ] ; then
-    insopts="-y /bin/true"
-fi
+#if [ Linux = $(uname -s) ] ; then
+#    insopts="-y /bin/true"
+#fi
 
 insertscript rpcbind <<'EOF'
 ### BEGIN INIT INFO
@@ -2460,9 +2460,9 @@
 check_script_present 2 nfs-common
 check_script_present 2 nfs-server
 check_order 2 nfs-common nfs-server
-if [ Linux = $(uname -s) ] ; then
-    insopts="-y /non-existing"
-fi
+#if [ Linux = $(uname -s) ] ; then
+#    insopts="-y /non-existing"
+#fi
 }
 ##########################################################################