Author: kelmo-guest
Date: Tue Jul 15 03:15:12 2008
New Revision: 782
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=782
Log:
* Make test_bogus_facility() run-testsuite function non-fatal.
* Mark tests that are currently failing with a comment in run-
testsuite.
Modified:
branches/insserv-1.11.9/Makefile
branches/insserv-1.11.9/debian/changelog
branches/insserv-1.11.9/debian/run-testsuite
branches/insserv-1.11.9/insserv.c
branches/insserv-1.11.9/insserv.conf
branches/insserv-1.11.9/tests/suite
Modified: branches/insserv-1.11.9/Makefile
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/Makefile?rev=782&op=diff
==============================================================================
--- branches/insserv-1.11.9/Makefile (original)
+++ branches/insserv-1.11.9/Makefile Tue Jul 15 03:15:12 2008
@@ -9,7 +9,7 @@
#DESTDIR = /tmp/root
#DEBUG = -DDEBUG=1 -Wpacked
DEBUG =
-ISSUSE = -DSUSE
+#ISSUSE = -DSUSE
DESTDIR =
VERSION = 1.11.9
DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]')
@@ -27,7 +27,7 @@
COPTS = -g -O2
endif
endif
- CFLAGS = -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64 \
+ 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
Modified: branches/insserv-1.11.9/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/changelog?rev=782&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/changelog (original)
+++ branches/insserv-1.11.9/debian/changelog Tue Jul 15 03:15:12 2008
@@ -44,8 +44,11 @@
* Add 82_improve_runlevel_override_output.patch to improve output when
overriding defaults with existing start|stop runlevel link
configuration.
-
- -- Kel Modderman <[EMAIL PROTECTED]> Tue, 15 Jul 2008 12:40:20 +1000
+ * Make test_bogus_facility() run-testsuite function non-fatal.
+ * Mark tests that are currently failing with a comment in run-
+ testsuite.
+
+ -- Kel Modderman <[EMAIL PROTECTED]> Tue, 15 Jul 2008 13:14:51 +1000
insserv (1.11.0-9) unstable; urgency=low
Modified: branches/insserv-1.11.9/debian/run-testsuite
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/run-testsuite?rev=782&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/run-testsuite (original)
+++ branches/insserv-1.11.9/debian/run-testsuite Tue Jul 15 03:15:12 2008
@@ -1132,7 +1132,7 @@
list_rclinks
-${severity}_script_not_present S needbogusvirtual
+test_script_not_present S needbogusvirtual
}
##########################################################################
test_insserv_conf_d() {
@@ -1322,9 +1322,9 @@
update_conf
test_normal_sequence
test_override_files
-test_override_loop
+test_override_loop # 2 rc tests failing
test_long_loop
-test_combined_loop
+test_combined_loop # 1 non-fatal test failing
test_fake_loop
test_fake_loop_reverse
test_badscript
@@ -1333,13 +1333,13 @@
test_removal
test_segfault_virtfac
test_incorrect_stopscripts
-test_newbug_keepoldorder
+test_newbug_keepoldorder # 3 rc tests failing
test_start_before
test_stop_after
test_adding_start
test_adding_stop
test_duplicate_provides
-test_bogus_facility
+test_bogus_facility # 1 non-fatal test failing
test_insserv_conf_d
test_broken_header
test_noprovides_header
Modified: branches/insserv-1.11.9/insserv.c
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/insserv.c?rev=782&op=diff
==============================================================================
--- branches/insserv-1.11.9/insserv.c (original)
+++ branches/insserv-1.11.9/insserv.c Tue Jul 15 03:15:12 2008
@@ -1292,7 +1292,12 @@
error("exiting now!\n");
}
- if (verbose && (begin && end && (!provides || (provides == empty) ||
!required_start || !required_stop)))
+ if (begin && end && (!provides || (provides == empty) ||
+#ifdef SUSE
+ !required_start || !required_stop || !default_start))
+#else
+ !required_start || !required_stop || !default_start
|| !default_stop))
+#endif
{
char *name = basename(path);
if (*name == 'S' || *name == 'K')
@@ -1306,6 +1311,12 @@
warn("missing `Required-Start:' entry: please add even if
empty.\n");
if (!required_stop)
warn("missing `Required-Stop:' entry: please add even if
empty.\n");
+ if (!default_start)
+ warn("missing `Default-Start:' entry: please add even if empty.\n");
+#ifndef SUSE
+ if (!default_stop)
+ warn("missing `Default-Stop:' entry: please add even if empty.\n");
+#endif
}
#undef provides
@@ -2296,24 +2307,24 @@
}
if (S_ISDIR(st_script.st_mode)) {
- const size_t l = strlen(*argv) - 1;
-
- path = *argv;
- if (*(path+l) == '/')
- *(path+l) = '\0';
+ const size_t l = strlen(*argv);
+
+ path = xstrdup(*argv);
+ if (path[l-1] == '/')
+ path[l-1] = '\0';
argv++;
argc--;
if (argc || del)
error("usage: %s [[-r] init_script|init_directory]\n", myname);
-
} else {
- char * base;
-
- if ((base = strrchr(*argv, '/'))) {
+ char * base, * ptr = xstrdup(*argv);
+
+ if ((base = strrchr(ptr, '/'))) {
*base = '\0';
- path = *argv;
- }
+ path = ptr;
+ } else
+ free(ptr);
}
}
@@ -2768,8 +2779,9 @@
*/
if (!defaults && (deflvls != service->start->lvl)) {
if (!del && chkfor(d->d_name, argv, argc) &&
!(argr[curr_argc]))
- warn("Warning, current start runlevel(s) %s
of script `%s' overwrites defaults %s.\n",
- lvl2str(service->start->lvl),
d->d_name, lvl2str(deflvls));
+ warn("Warning, current start runlevel(s)
(%s) of script `%s' overwrites defaults (%s).\n",
+ service->start->lvl ?
lvl2str(service->start->lvl) : "empty", d->d_name,
+ lvl2str(deflvls));
}
} else
/*
@@ -2778,15 +2790,17 @@
*/
service->start->lvl = deflvls;
- } else {
+ } else if (script_inf.default_start != empty) {
/*
* Could be a none LSB script, use info from current
link scheme.
* If not found use default.
*/
if (service->attr.flags & SERV_ENABLED)
script_inf.default_start =
lvl2str(service->start->lvl);
+#ifdef SUSE
else
script_inf.default_start =
xstrdup(DEFAULT_START_LVL);
+#endif
}
#ifdef SUSE
/*
@@ -2811,8 +2825,9 @@
*/
if (!defaults && (deflvlk != service->stopp->lvl)) {
if (!del && chkfor(d->d_name, argv, argc) &&
!(argr[curr_argc]))
- warn("Warning, current stop runlevel(s) %s
of script `%s' overwrites defaults %s.\n",
- lvl2str(service->stopp->lvl),
d->d_name, lvl2str(deflvlk));
+ warn("Warning, current stop runlevel(s)
(%s) of script `%s' overwrites defaults (%s).\n",
+ service->stopp->lvl ?
lvl2str(service->stopp->lvl) : "empty", d->d_name,
+ lvl2str(deflvlk));
}
} else
/*
@@ -2821,26 +2836,41 @@
*/
service->stopp->lvl = deflvlk;
- } else {
+ } else if (script_inf.default_stop != empty) {
/*
* Could be a none LSB script, use info from current
link scheme.
* If not found use default.
*/
if (service->attr.flags & SERV_ENABLED)
script_inf.default_stop =
lvl2str(service->stopp->lvl);
+#ifdef SUSE
else
script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
+#endif
}
}
}
free(provides);
}
+#ifdef SUSE
/* Ahh ... set default multiuser with network */
if (!script_inf.default_start || script_inf.default_start == empty)
script_inf.default_start = xstrdup(DEFAULT_START_LVL);
if (!script_inf.default_stop || script_inf.default_start == empty)
script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
+#else
+ if (!script_inf.default_start) {
+ warn("Default-Start undefined, assuming empty start runlevel(s) for
script `%s'\n",
+ d->d_name);
+ script_inf.default_start = empty;
+ }
+ if (!script_inf.default_stop) {
+ warn("Default-Stop undefined, assuming empty stop runlevel(s) for
script `%s'\n",
+ d->d_name);
+ script_inf.default_stop = empty;
+ }
+#endif
if (chkfor(d->d_name, argv, argc) && !defaults && !del) {
if (argr[curr_argc]) {
@@ -2960,7 +2990,7 @@
*/
follow_all();
if (is_loop_detected() && !ignore)
- error("exiting now!\n");
+ error("exiting without changing boot order!\n");
/*
* Be sure that interactive scripts are the only member of
Modified: branches/insserv-1.11.9/insserv.conf
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/insserv.conf?rev=782&op=diff
==============================================================================
--- branches/insserv-1.11.9/insserv.conf (original)
+++ branches/insserv-1.11.9/insserv.conf Tue Jul 15 03:15:12 2008
@@ -1,29 +1,29 @@
#
# All local filesystems are mounted (done during boot phase)
#
-$local_fs boot.localfs
+$local_fs +mountall +mountoverflowtmp +umountfs
#
# Low level networking (ethernet card)
#
-$network network +pcmcia +hotplug
+$network +networking +ifupdown
#
# Named is operational
#
-$named +named +dnsmasq +lwresd $network
+$named +named +dnsmasq +lwresd +bind9 $network
#
# All remote filesystems are mounted (note in some cases /usr may
# be remote. Most applications that care will probably require
# both $local_fs and $remote_fs)
#
-$remote_fs $local_fs +nfs
+$remote_fs $local_fs +mountnfs +mountnfs-bootclean +umountnfs +sendsigs
#
# System logger is operational
#
-$syslog syslog
+$syslog +syslog +sysklogd +rsyslog +syslog-ng
#
# SunRPC portmapper available
@@ -33,9 +33,9 @@
#
# The system time has been set correctly
#
-$time boot.clock +xntpd
+$time hwclock
#
# Services which need to be interactive
#
-<interactive> boot.crypto boot.localfs boot.rootfsck apache apache2 kdump
+<interactive> glibc hostname mountkernfs udev mountdevsubfs checkroot
checkfs console-screen keymap
Modified: branches/insserv-1.11.9/tests/suite
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/tests/suite?rev=782&op=diff
==============================================================================
--- branches/insserv-1.11.9/tests/suite (original)
+++ branches/insserv-1.11.9/tests/suite Tue Jul 15 03:15:12 2008
@@ -15,12 +15,15 @@
: ${debug:=""}
declare -i retval=0
+declare -i checkfailed=0
+declare -i testcount=0
+declare -i testfailed=0
finish_test ()
{
if test 0 -ne $retval ; then
- echo "error: one or more test failed."
+ echo "error: $testcount test executed, $checkfailed fatal tests
failed, $testfailed nonfatal test failed."
else
- echo "success: no test failed."
+ echo "success: $testcount test executed, $testfailed nonfatal tests
failed."
fi
rm -rf ${tmpdir}
return $retval
@@ -172,15 +175,22 @@
echo "$path"
}
+counttest ()
+{
+ testcount=$(expr $testcount + 1)
+}
+
error ()
{
echo error: $@
+ checkfailed=$(expr $checkfailed + 1)
retval=1
}
warning ()
{
echo warning: $@
+ testfailed=$(expr $testfailed + 1)
}
addscript ()
@@ -204,6 +214,7 @@
local script=$1; shift
local ret=0
test -L ${rcdpath}/[KS][0-9][0-9]$script || ret=1
+ counttest
return $ret
}
@@ -271,6 +282,7 @@
fi
popd &> /dev/null
test "$order" = "$script1 $script2" || ret=1
+ counttest
return $ret
}
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
