[Initscripts-ng-commits] r1066 - in /trunk/src/insserv/debian: ./ patches/ source/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Mon Apr 9 06:26:31 UTC 2012
Author: kelmo-guest
Date: Mon Apr 9 06:26:30 2012
New Revision: 1066
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1066
Log:
* Acknowledge NMUs, thanks Christian & Luk.
* Use source format 3.0 (quilt), drop build dependency on quilt.
* Use dh at compat level 9, significantly reduce debian/rules and
build depend on debhelper >= 9.
* Use dh_bash-completion dh sequence utility to install completion
snippet, rename snippet to debian/insserv.bash-completion and build
depend on bash-completion.
* Use dpkg-buildflags to set default CFLAGS & LDFLAGS and get noopt
handling for free. 130_crossbuild_fixes.patch allows upstream
Makefile defaults for COPTS, LDFLAGS & CC to be overridden by the
environment variables exported by debian/rules. Also decouple `make
check' from `make install' to ease cross building. Set & export CC
environment variable in debian/rules to (hopefully) allow cross
building. (Closes: #629540, #629539, #666212)
* Patch upstream Makefile to execute Debian testsuite instead of
common suite.
* Update to Standards-Version 3.9.3, no changes in policy warranted
changes in packaging.
* Refresh patch series.
* Suggest the actively maintained bootchart2 instead of the doormant
bootchart package. (Closes: #599012)
* Update insserv package description. (Closes: #549327)
* Undocument the CONCURRENCY feature and add a reference to a modern
discussion about the status of init systems in Debian. (Closes: #605368)
* Add test_invalid_core_string to test conditions described in
#611292.
* Correctly quote here statements in test_undetected_loop with non-
interpolating quotation marks. Make test unconditionally fatal now
that test is not incorrectly interpolating $local_fs in script headers.
* Add 150_core_string_test.patch from Ben Harris <bjh21 at cam.ac.uk> to
fix inconsistent filtering of core dumps. (Closes: #611292)
Added:
trunk/src/insserv/debian/insserv.bash-completion
- copied unchanged from r1065, trunk/src/insserv/debian/bash-completion
trunk/src/insserv/debian/install
trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch
trunk/src/insserv/debian/patches/140_debian_test_suite.patch
trunk/src/insserv/debian/patches/150_core_string_test.patch
Removed:
trunk/src/insserv/debian/bash-completion
Modified:
trunk/src/insserv/debian/README.Debian
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/compat
trunk/src/insserv/debian/control
trunk/src/insserv/debian/patches/110_portmap.patch
trunk/src/insserv/debian/patches/11_debian_conf.patch
trunk/src/insserv/debian/patches/series
trunk/src/insserv/debian/rules
trunk/src/insserv/debian/run-testsuite
trunk/src/insserv/debian/source/format
Modified: trunk/src/insserv/debian/README.Debian
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/README.Debian?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/README.Debian (original)
+++ trunk/src/insserv/debian/README.Debian Mon Apr 9 06:26:30 2012
@@ -1,36 +1,16 @@
-Dependency based boot sequencing is the default in Debian. The
+Dependency based boot sequencing is the default in Debian. The
insserv program is used by sysv-rc to order init.d scripts based on
-their declared dependencies.
+dependencies declared in the LSB information within the scripts
+themselves.
-An experimental feature to run init.d scripts in parallel is also
-available. Use the CONCURRENCY setting in /etc/default/rcS to
-enable it.
-
-In short:
-
- # Enable parallel booting
- echo CONCURRENCY=makefile >> /etc/default/rcS
-
- # Ready to reboot
- shutdown -r now
-
-The next boot should then start services in parallel, as early as
-possible during the boot process based on the dependency information
-provided.
-
-The 'makefile' style concurrency depend on complete and correct
-dependencies in all init.d scripts. There is a simpler and less
-strict style 'startpar', which only require all scripts with the same
-sequence number to be able to run in parallel, and thus accept
-incomplete dependencies as long as the boot sequence number is OK.
-
-To monitor the boot sequence, the bootchart project is a good choice.
-Debian packages are available in etch and sid. The project itself is
-available from <URL:http://www.bootchart.org/>.
+To monitor the boot sequence, the bootchart2 project is a good choice and
+Debian packages are available.
Background info on alternative boot systems in Debian is available
-from
-<URL:http://alioth.debian.org/docman/view.php/30730/38/debconf2-initscripts-bkg.pdf>.
+from:
+<URL:http://alioth.debian.org/docman/view.php/30730/38/debconf2-initscripts-bkg.pdf>
+and more recently:
+<URL:https://lists.debian.org/debian-devel/2012/03/msg00452.html>
Information on the LSB initscript comment convention is available from
<URL:http://refspecs.freestandards.org/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html>,
Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Mon Apr 9 06:26:30 2012
@@ -1,3 +1,39 @@
+insserv (1.14.0-3) unstable; urgency=low
+
+ * Acknowledge NMUs, thanks Christian & Luk.
+ * Use source format 3.0 (quilt), drop build dependency on quilt.
+ * Use dh at compat level 9, significantly reduce debian/rules and
+ build depend on debhelper >= 9.
+ * Use dh_bash-completion dh sequence utility to install completion
+ snippet, rename snippet to debian/insserv.bash-completion and build
+ depend on bash-completion.
+ * Use dpkg-buildflags to set default CFLAGS & LDFLAGS and get noopt
+ handling for free. 130_crossbuild_fixes.patch allows upstream
+ Makefile defaults for COPTS, LDFLAGS & CC to be overridden by the
+ environment variables exported by debian/rules. Also decouple `make
+ check' from `make install' to ease cross building. Set & export CC
+ environment variable in debian/rules to (hopefully) allow cross
+ building. (Closes: #629540, #629539, #666212)
+ * Patch upstream Makefile to execute Debian testsuite instead of
+ common suite.
+ * Update to Standards-Version 3.9.3, no changes in policy warranted
+ changes in packaging.
+ * Refresh patch series.
+ * Suggest the actively maintained bootchart2 instead of the doormant
+ bootchart package. (Closes: #599012)
+ * Update insserv package description. (Closes: #549327)
+ * Undocument the CONCURRENCY feature and add a reference to a modern
+ discussion about the status of init systems in Debian. (Closes: #605368)
+ * Add test_invalid_core_string to test conditions described in
+ #611292.
+ * Correctly quote here statements in test_undetected_loop with non-
+ interpolating quotation marks. Make test unconditionally fatal now
+ that test is not incorrectly interpolating $local_fs in script headers.
+ * Add 150_core_string_test.patch from Ben Harris <bjh21 at cam.ac.uk> to
+ fix inconsistent filtering of core dumps. (Closes: #611292)
+
+ -- Kel Modderman <kel at otaku42.de> Mon, 09 Apr 2012 16:23:48 +1000
+
insserv (1.14.0-2.2) unstable; urgency=low
* Non-maintainer upload.
Modified: trunk/src/insserv/debian/compat
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/compat?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/compat (original)
+++ trunk/src/insserv/debian/compat Mon Apr 9 06:26:30 2012
@@ -1,1 +1,1 @@
-6
+9
Modified: trunk/src/insserv/debian/control
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/control?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/control (original)
+++ trunk/src/insserv/debian/control Mon Apr 9 06:26:30 2012
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Petter Reinholdtsen <pere at debian.org>
Uploaders: Kel Modderman <kel at otaku42.de>
-Build-Depends: debhelper (>= 6.0.7), po-debconf, quilt
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9), po-debconf, bash-completion
+Standards-Version: 3.9.3
DM-Upload-Allowed: yes
Homepage: http://savannah.nongnu.org/projects/sysvinit
Vcs-Svn: svn://svn.debian.org/initscripts-ng/trunk/src/insserv
@@ -13,18 +13,15 @@
Package: insserv
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: bootchart
+Suggests: bootchart2
Breaks: sysv-rc (<< 2.87dsf-3)
-Description: Tool to organize boot sequence using LSB init.d script dependencies
- The insserv program is used to update the order of symlinks in
- /etc/rc?.d/ with sysv-rc based on dependencies specified in the
- scripts themselves using LSB init.d script headers.
+Description: boot sequence organizer using LSB init.d script dependencies
+ The insserv program is used by the standard SysV-based init system. It
+ updates the order of symlinks in /etc/rc?.d/ based on dependencies
+ specified by LSB headers in the init.d scripts themselves.
.
- This allow each package maintainer to specify their init.d script
- relation to other scripts and make it possible to detect and reject
- script dependency loops as well as making sure all scripts start in
- their intended order.
+ These declared relations between scripts make it possible to optimize
+ the boot sequence for the currently installed set of packages, while
+ detecting and rejecting dependency loops.
.
- The program insserv in this package should be used with care and
- together with the sysv-rc package, as using it incorrectly can lead
- to an unbootable system.
+ Using insserv incorrectly can result in an unbootable system.
Added: trunk/src/insserv/debian/install
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/install?rev=1066&op=file
==============================================================================
--- trunk/src/insserv/debian/install (added)
+++ trunk/src/insserv/debian/install Mon Apr 9 06:26:30 2012
@@ -1,0 +1,6 @@
+debian/make-testsuite usr/share/insserv
+debian/check-initd-order usr/share/insserv
+debian/seq-changes usr/share/insserv
+debian/check-archive-initd-scripts usr/share/insserv
+debian/overrides/* usr/share/insserv/overrides
+debian/update-*-insserv usr/sbin
Modified: trunk/src/insserv/debian/patches/110_portmap.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/110_portmap.patch?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/110_portmap.patch (original)
+++ trunk/src/insserv/debian/patches/110_portmap.patch Mon Apr 9 06:26:30 2012
@@ -1,9 +1,7 @@
Drop central definition of $portmap, it's better served by the individual packages providing $portmap.
-Index: insserv-1.14.0/insserv.conf
-===================================================================
---- insserv-1.14.0.orig/insserv.conf 2011-03-19 12:42:01.000000000 +0100
-+++ insserv-1.14.0/insserv.conf 2011-03-19 12:42:11.000000000 +0100
-@@ -26,11 +26,6 @@
+--- a/insserv.conf
++++ b/insserv.conf
+@@ -26,11 +26,6 @@ $remote_fs $local_fs +mountnfs +mountnfs
$syslog +rsyslog +sysklogd +syslog-ng +dsyslog +inetutils-syslogd
#
Modified: trunk/src/insserv/debian/patches/11_debian_conf.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/11_debian_conf.patch?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/11_debian_conf.patch (original)
+++ trunk/src/insserv/debian/patches/11_debian_conf.patch Mon Apr 9 06:26:30 2012
@@ -2,10 +2,8 @@
Fixes: None, made as part of Debian porting.
Status: Debian specific, showed to upstream.
---
-Index: insserv-1.14.0/insserv.conf
-===================================================================
---- insserv-1.14.0.orig/insserv.conf 2010-02-19 14:08:04.000000000 +0100
-+++ insserv-1.14.0/insserv.conf 2011-03-19 12:48:16.000000000 +0100
+--- a/insserv.conf
++++ b/insserv.conf
@@ -1,29 +1,29 @@
#
# All local filesystems are mounted (done during boot phase)
@@ -41,7 +39,7 @@
#
# SunRPC portmapper available
-@@ -33,9 +33,9 @@
+@@ -33,9 +33,9 @@ $portmap portmap
#
# The system time has been set correctly
#
Added: trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch?rev=1066&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch (added)
+++ trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch Mon Apr 9 06:26:30 2012
@@ -1,0 +1,44 @@
+Description: Separate check from install so checks can be made optional
+ In order to support DEB_BUILD_OPTIONS=nocheck cleanly the install and
+ check targets are best separated.
+ Also allow COPTS, LDFLAGS and CC to be overridden by environment
+ (Kel Modderman <kel at otaku42.de>).
+.
+Author: Wookey <wookey at linaro.org>
+Last-Update: 2012-04-09
+
+--- a/Makefile
++++ b/Makefile
+@@ -25,20 +25,20 @@ else
+ ifeq ($(ARCH),i386)
+ COPTS = -g -O3 -mcpu=i586 -mtune=i686
+ else
+- COPTS = -g -O2
++ COPTS ?= -g -O2
+ endif
+ endif
+ CFLAGS = -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
+ $(ISSUSE) -DINITDIR=\"$(INITDIR)\" -DINSCONF=\"$(INSCONF)\" -pipe
+ CLOOP = -falign-loops=0
+- LDFLAGS = -Wl,-O,3,--relax
++ LDFLAGS ?= -Wl,-O,3,--relax
+ LIBS =
+ ifdef USE_RPMLIB
+ CFLAGS += -DUSE_RPMLIB=1
+ LDFLAGS += -Wl,--as-needed
+ LIBS += -lrpm
+ endif
+- CC = gcc
++ CC ?= gcc
+ RM = rm -f
+ MKDIR = mkdir -p
+ RMDIR = rm -rf
+@@ -134,7 +134,7 @@ else
+ tests/common
+ endif
+
+-install: $(TODO) check
++install: $(TODO)
+ $(MKDIR) $(SBINDIR)
+ $(MKDIR) $(SDOCDIR)
+ $(MKDIR) $(CONFDIR)
Added: trunk/src/insserv/debian/patches/140_debian_test_suite.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/140_debian_test_suite.patch?rev=1066&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/140_debian_test_suite.patch (added)
+++ trunk/src/insserv/debian/patches/140_debian_test_suite.patch Mon Apr 9 06:26:30 2012
@@ -1,0 +1,14 @@
+Description: Execute the Debian test suite on `make check'.
+Author: Kel Modderman <kel at otaku42.de>
+--- a/Makefile
++++ b/Makefile
+@@ -131,7 +131,8 @@ ifeq ($(ISSUSE),-DSUSE)
+ issuse=true tests/common
+ # issuse=true tests/suse
+ else
+- tests/common
++ chmod a+rx debian/run-testsuite
++ debian/run-testsuite
+ endif
+
+ install: $(TODO)
Added: trunk/src/insserv/debian/patches/150_core_string_test.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/150_core_string_test.patch?rev=1066&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/150_core_string_test.patch (added)
+++ trunk/src/insserv/debian/patches/150_core_string_test.patch Mon Apr 9 06:26:30 2012
@@ -1,0 +1,23 @@
+Description: improve detection of old style core dumps
+ The proposed patch is wrong: as written it arranges to reject filenames
+ that begin with ".core", rather than those that end with ".core". Files
+ whose names end ".core" are already rejected by cfgfile_filter(), and
+ files whose names begin ".core" are rejected by the general rejection of
+ filenames beginning with ".".
+
+ I think the original test is intended to trap old-style core dumps, which
+ are always called simply "core". This could be correctly achieved by:
+Author: Ben Harris <bjh21 at cam.ac.uk>
+Bug-Debian: bugs.debian.org/611292
+---
+--- a/insserv.c
++++ b/insserv.c
+@@ -2768,7 +2768,7 @@ int main (int argc, char *argv[])
+ continue;
+ }
+
+- if (!strncmp(d->d_name, "core", strlen("core"))) {
++ if (!strcmp(d->d_name, "core")) {
+ if (isarg)
+ warn("script name %s is not valid, skipped!\n", d->d_name);
+ continue;
Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Mon Apr 9 06:26:30 2012
@@ -6,3 +6,6 @@
92_m68k_alignment.patch
#100_show.patch
110_portmap.patch
+130_crossbuild_fixes.patch
+140_debian_test_suite.patch
+150_core_string_test.patch
Modified: trunk/src/insserv/debian/rules
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/rules?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/rules (original)
+++ trunk/src/insserv/debian/rules Mon Apr 9 06:26:30 2012
@@ -1,106 +1,16 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+COPTS = $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+CC = gcc
-PACKAGE = insserv
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS = -g -O0
-else
- CFLAGS = -g -O2
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+ CC=$(DEB_HOST_GNU_TYPE)-gcc
endif
-#CFLAGS += -DDEBUG=1
+export COPTS LDFLAGS CC
-INSTALL = install
-INSTALL_DATA = $(INSTALL) -m644
-DESTDIR = $(CURDIR)/debian/$(PACKAGE)
-
-pkgdatadir = /usr/share/$(PACKAGE)
-sbindir = /usr/sbin
-
-include /usr/share/quilt/quilt.make
-
-build: build-stamp
-
-build-stamp: $(QUILT_STAMPFN)
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE) COPTS="$(CFLAGS)"
-
- chmod a+rx debian/run-testsuite
- debian/run-testsuite
-
- touch build-stamp
-
-clean:
- dh_testdir
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- $(MAKE) clean
-
- # Remove patches after doing 'make clean', to allow patches to adjust the clean target
- $(MAKE) -f debian/rules unpatch
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/$(PACKAGE).
- $(MAKE) install COPTS="$(CFLAGS)" DESTDIR=$(DESTDIR)
-
- # Install overrides if present
- for data in debian/overrides/* ; do \
- test -f $$data || continue ; \
- $(INSTALL_DATA) $$data $(DESTDIR)$(pkgdatadir)/overrides/. ;\
- done
-
- $(INSTALL) debian/check-initd-order $(DESTDIR)$(pkgdatadir)/.
- $(INSTALL) debian/check-archive-initd-scripts \
- $(DESTDIR)$(pkgdatadir)/.
- $(INSTALL) debian/seq-changes $(DESTDIR)$(pkgdatadir)/.
- $(INSTALL) debian/make-testsuite $(DESTDIR)$(pkgdatadir)/.
- $(INSTALL) debian/update-bootsystem-insserv $(DESTDIR)$(sbindir)/.
- $(INSTALL) debian/update-rc.d-insserv $(DESTDIR)$(sbindir)/.
-
- # Install bash(1) completion
- $(INSTALL_DATA) debian/bash-completion $(DESTDIR)/etc/bash_completion.d/insserv
-
- dh_lintian
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGES
- dh_installdocs
- dh_installexamples
- dh_installdebconf
-# dh_install
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-.PHONY: phony
+%:
+ dh $@ --with=bash-completion
Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Mon Apr 9 06:26:30 2012
@@ -4,8 +4,10 @@
. $basedir/../tests/suite
if head -1 debian/changelog | grep -q UNRELEASED ; then
+ # fatal
severity=check
else
+ # non-fatal
severity=test
fi
@@ -2159,7 +2161,7 @@
EOF
set -C
-insertscript hibernate <<EOF
+insertscript hibernate <<'EOF'
### BEGIN INIT INFO
# Provides: hibernate-cleanup
# Default-Start: S
@@ -2171,7 +2173,7 @@
### END INIT INFO
EOF
-insertscript mountall.sh <<EOF
+insertscript mountall.sh <<'EOF'
### BEGIN INIT INFO
# Provides: mountall
# Required-Start:
@@ -2183,7 +2185,7 @@
EOF
# Inserting this script should fail, as it introduces a loop
-insertscript mdadm <<EOF || true
+insertscript mdadm <<'EOF' || true
### BEGIN INIT INFO
# Provides: mdadm
# Required-Start: $local_fs
@@ -2194,7 +2196,7 @@
EOF
# Inserting this script should definitely fail, as it depend on a loop
-insertscript test <<EOF || true
+insertscript test <<'EOF' || true
### BEGIN INIT INFO
# Provides: test
# Required-Start: $local_fs mdadm
@@ -2206,8 +2208,65 @@
list_rclinks
-${severity}_script_not_present S mdadm
-${severity}_script_not_present S test
+check_script_not_present S mdadm
+check_script_not_present S test
+}
+
+##########################################################################
+
+test_invalid_core_string() {
+echo
+echo "info: test if insserv accepts 'corekeeper' but rejects core dumps"
+echo "info: named '*.core' or 'core'"
+echo "info: See bug report #554905."
+echo
+
+initdir_purge
+
+set +C
+cat <<'EOF' > $insconf
+$local_fs mountall
+EOF
+set -C
+
+# should be accepted - valid name
+insertscript corekeeper <<'EOF'
+### BEGIN INIT INFO
+# Provides: corekeeper
+# Default-Start: S
+# Default-Stop:
+# Required-Start:
+# Required-Stop:
+### END INIT INFO
+EOF
+
+# should be rejected - invalid name
+insertscript somescript.core <<'EOF'
+### BEGIN INIT INFO
+# Provides: somescript
+# Default-Start: S
+# Default-Stop:
+# Required-Start:
+# Required-Stop:
+### END INIT INFO
+EOF
+
+# should be rejected - invalid name
+insertscript core <<'EOF'
+### BEGIN INIT INFO
+# Provides: someotherscript
+# Default-Start: S
+# Default-Stop:
+# Required-Start:
+# Required-Stop:
+### END INIT INFO
+EOF
+
+list_rclinks
+
+check_script_not_present S core
+check_script_not_present S somescript
+check_script_present S corekeeper
}
##########################################################################
@@ -2252,3 +2311,4 @@
test_local_virtual
test_insserv_upstart
test_undetected_loop # 2 non-fatal tests failing
+test_invalid_core_string
Modified: trunk/src/insserv/debian/source/format
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/source/format?rev=1066&op=diff
==============================================================================
--- trunk/src/insserv/debian/source/format (original)
+++ trunk/src/insserv/debian/source/format Mon Apr 9 06:26:30 2012
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)
More information about the Initscripts-ng-commits
mailing list