commit f9941cf29f6ae6ecb6a7bd03ab0429866e23f369
parent 74f47332ce1c2b8f7db8640dfeeab39827561cbe
Author: Gerrit Pape <pape@smarden.org>
Date: Mon, 1 Sep 2003 11:06:05 +0000
* svlogd.c: barf if all log directories given at the command line fail.
* man/svlogd.8: adapt.
0.11.1.
Diffstat:
11 files changed, 63 insertions(+), 32 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
DESTDIR=
-PACKAGE=runit-0.11.0
+PACKAGE=runit-0.11.1
DIRS=doc man etc package src
MANPAGES=runit.8 runit-init.8 runsvdir.8 runsv.8 svwaitdown.8 svwaitup.8 \
utmpset.8 runsvchdir.8 runsvstat.8 runsvctrl.8 svlogd.8 chpst.8
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+runit (0.11.1-0) unstable; urgency=low
+
+ * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org> Mon, 1 Sep 2003 13:04:20 +0200
+
runit (0.11.0-1) unstable; urgency=low
* new upstream version:
diff --git a/debian/rules b/debian/rules
@@ -41,13 +41,13 @@ build-arch: configure-stamp build-arch-stamp
build-arch-stamp:
dh_testdir
- tar xfzvp runit-0.11.0.tar.gz
+ tar xfzvp runit-0.11.1.tar.gz
-gcc -v
( \
set -e; \
- cd admin/runit-0.11.0/src; \
- ln -s runit-0.11.0 runit; mv runit ../..; \
+ cd admin/runit-0.11.1/src; \
+ ln -s runit-0.11.1 runit; mv runit ../..; \
echo "$(CC) $(CFLAGS)" >conf-cc; \
echo "$(CC) $(LDFLAGS)" >conf-ld; \
$(MAKE); \
@@ -79,37 +79,37 @@ install: build
dh_installdirs
# runit
- install -m0500 admin/runit-0.11.0/src/runit \
+ install -m0500 admin/runit-0.11.1/src/runit \
$(CURDIR)/debian/runit/sbin/runit
- install -m0500 admin/runit-0.11.0/src/runit-init \
+ install -m0500 admin/runit-0.11.1/src/runit-init \
$(CURDIR)/debian/runit/sbin/runit-init
- install -m0755 admin/runit-0.11.0/src/runsvdir \
+ install -m0755 admin/runit-0.11.1/src/runsvdir \
$(CURDIR)/debian/runit/usr/bin/runsvdir
- install -m0755 admin/runit-0.11.0/src/runsv \
+ install -m0755 admin/runit-0.11.1/src/runsv \
$(CURDIR)/debian/runit/usr/bin/runsv
- install -m0755 admin/runit-0.11.0/src/runsvchdir \
+ install -m0755 admin/runit-0.11.1/src/runsvchdir \
$(CURDIR)/debian/runit/usr/sbin/runsvchdir
- install -m0755 admin/runit-0.11.0/src/svlogd \
+ install -m0755 admin/runit-0.11.1/src/svlogd \
$(CURDIR)/debian/runit/usr/bin/svlogd
- install -m0755 admin/runit-0.11.0/src/svwaitdown \
+ install -m0755 admin/runit-0.11.1/src/svwaitdown \
$(CURDIR)/debian/runit/usr/bin/svwaitdown
- install -m0755 admin/runit-0.11.0/src/svwaitup \
+ install -m0755 admin/runit-0.11.1/src/svwaitup \
$(CURDIR)/debian/runit/usr/bin/svwaitup
- install -m0755 admin/runit-0.11.0/src/utmpset \
+ install -m0755 admin/runit-0.11.1/src/utmpset \
$(CURDIR)/debian/runit/usr/sbin/utmpset
- install -m0755 admin/runit-0.11.0/src/runsvstat \
+ install -m0755 admin/runit-0.11.1/src/runsvstat \
$(CURDIR)/debian/runit/usr/bin/runsvstat
- install -m0755 admin/runit-0.11.0/src/runsvctrl \
+ install -m0755 admin/runit-0.11.1/src/runsvctrl \
$(CURDIR)/debian/runit/usr/bin/runsvctrl
- install -m0755 admin/runit-0.11.0/src/chpst \
+ install -m0755 admin/runit-0.11.1/src/chpst \
$(CURDIR)/debian/runit/usr/bin/chpst
# temporary?
( cd $(CURDIR)/debian/runit/usr/sbin/ && ln -s ../bin/chpst setuidgid )
- install -m0755 admin/runit-0.11.0/etc/debian/getty-tty5/run \
+ install -m0755 admin/runit-0.11.1/etc/debian/getty-tty5/run \
$(CURDIR)/debian/runit/etc/runit/getty-5/run
- install -m0755 admin/runit-0.11.0/etc/debian/getty-tty5/finish \
+ install -m0755 admin/runit-0.11.1/etc/debian/getty-tty5/finish \
$(CURDIR)/debian/runit/etc/runit/getty-5/finish
# lintian overrides
@@ -148,7 +148,7 @@ binary-arch: build install
# dh_installdocs -an
# dh_installexamples -a
dh_installman -a admin/runit/man/*.8
- dh_installchangelogs -a admin/runit-0.11.0/package/CHANGES
+ dh_installchangelogs -a admin/runit-0.11.1/package/CHANGES
dh_strip -a
# dh_link -a
dh_compress -a
diff --git a/doc/install.html b/doc/install.html
@@ -17,14 +17,14 @@ If you don't have a <tt>/package</tt> directory, create it now:
# chmod 1755 /package
</pre>
Download
-<a href="runit-0.11.0.tar.gz">runit-0.11.0.tar.gz</a> into <tt>/package</tt>
+<a href="runit-0.11.1.tar.gz">runit-0.11.1.tar.gz</a> into <tt>/package</tt>
and unpack the archive
<pre>
# cd /package
- # gunzip runit-0.11.0.tar
- # tar -xpf runit-0.11.0.tar
- # rm runit-0.11.0.tar
- # cd admin/runit-0.11.0
+ # gunzip runit-0.11.1.tar
+ # tar -xpf runit-0.11.1.tar
+ # rm runit-0.11.1.tar
+ # cd admin/runit-0.11.1
</pre>
On MacOSX, do
<pre>
@@ -43,7 +43,7 @@ hierarchy, do:
</pre>
To report success:
<pre>
- # mail pape-runit-0.11.0@smarden.org <compile/sysdeps
+ # mail pape-runit-0.11.1@smarden.org <compile/sysdeps
</pre>
Refer to <a href="replaceinit.html">replacing init</a> for
replacing <i>init</i> with <i>runit</i>, or to
diff --git a/doc/replaceinit.html b/doc/replaceinit.html
@@ -108,7 +108,7 @@ default Unix process no 1 <i>runit</i>.
</pre>
To report success:
<pre>
- # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.11.0@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.11.1@smarden.org
</pre>
<hr>
@@ -189,7 +189,7 @@ Use <b>init 6</b> to reboot and <b>init 0</b> to halt a system that runs
<p>
To report success:
<pre>
- # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.11.0@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.11.1@smarden.org
</pre>
<h3>Step 5: Service migration</h3>
The goal is to migrate all services from <i>/etc/rc.*</i> scheme to the
diff --git a/doc/upgrade.html b/doc/upgrade.html
@@ -10,7 +10,7 @@
<h1>runit - upgrading from previous versions</h1>
<hr>
-<h3>0.10.0 to 0.11.0</h3>
+<h3>0.10.0 to 0.11.0 or 0.11.1</h3>
This version introduces the new <a href="chpst.8.html">chpst</a> program,
which changes the process state as specified by command line options, and runs
another program with this process state.
diff --git a/man/svlogd.8 b/man/svlogd.8
@@ -26,7 +26,6 @@ can be told to alert selected log messages to standard error.
.B svlogd
runs until it sees end-of-file on standard input or is sent a TERM signal,
see below.
-
.SS LOG DIRECTORY
A log directory
.I log
@@ -50,6 +49,16 @@ and optionally the file
.IR config .
.B svlogd
creates necessary files if they don't exist.
+.P
+If
+.B svlogd
+has trouble opening a log directory, it prints a warning, and ignores this
+log directory.
+If
+.B svlogd
+is unable to open all log directories given at the command line, it exits
+with an error.
+This can happen on start-up or after receiving a HUP signal.
.SS LOG FILE ROTATION
.B svlogd
appends selected log messages to the
@@ -298,6 +307,14 @@ is sent a HUP signal, it closes and reopens all
.IR logs ,
and updates their configuration according to
.IR log/config .
+If
+.B svlogd
+has trouble opening a log directory, it prints a warning, and discards this
+log directory.
+If
+.B svlogd
+is unable to open all log directories given at the command line, it exits
+with an error.
.P
If
.B svlogd
diff --git a/package/CHANGES b/package/CHANGES
@@ -1,5 +1,9 @@
+runit 0.11.1
+Mon, 01 Sep 2003 13:02:57 +0200
* src/Makefile: add dependency to sysdeps to target fmt_ptime.o (thx Thomas
Schwinge).
+ * svlogd.c: barf if all log directories given at the command line fail.
+ * man/svlogd.8: adapt.
runit 0.11.0
Fri, 08 Aug 2003 12:37:14 +0200
diff --git a/package/upgrade b/package/upgrade
@@ -7,9 +7,9 @@ test -d src || ( echo 'Wrong working directory.'; exit 1 )
here=`env - PATH=$PATH pwd`
parent=`dirname $here`
-echo 'Creating symlink runit -> runit-0.11.0...'
+echo 'Creating symlink runit -> runit-0.11.1...'
rm -f runit
-ln -s runit-0.11.0 runit
+ln -s runit-0.11.1 runit
mv -f runit ..
echo 'Making command links in /command...'
diff --git a/package/versions b/package/versions
@@ -17,3 +17,4 @@
0.9.5
0.10.0
0.11.0
+0.11.1
diff --git a/src/svlogd.c b/src/svlogd.c
@@ -80,6 +80,7 @@ unsigned int dirn =0;
void usage() { strerr_die4x(111, "usage: ", progname, USAGE, "\n"); }
void die_nomem() { strerr_die2x(111, FATAL, "out of memory."); }
void fatal(char *m0) { strerr_die3sys(111, FATAL, m0, ": "); }
+void fatalx(char *m0) { strerr_die2x(111, FATAL, m0); }
void fatal2(char *m0, char *m1) {
strerr_die5sys(111, FATAL, m0, ": ", m1, ": ");
}
@@ -396,11 +397,13 @@ unsigned int logdir_open(struct logdir *ld, const char *fn) {
void logdirs_reopen(void) {
int l;
+ int ok =0;
for (l =0; l < dirn; ++l) {
logdir_close(&dir[l]);
- logdir_open(&dir[l], fndir[l]);
+ if (logdir_open(&dir[l], fndir[l])) ok =1;
}
+ if (! ok) fatalx("no functional log directories.");
}
unsigned int linestart(struct logdir *ld, char *s, int len) {
