Merge branch '3.02'

Makefile

@@ -3,6 +3,7 @@ VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p' doc/Changel
 
 all install clean distclean:
 	@rm -f $(PACKAGE)-$(VERSION).tar.xz $(PACKAGE)-$(VERSION).tar.xz.sig
+	$(MAKE) VERSION=$(VERSION) -C man $@
 	$(MAKE) VERSION=$(VERSION) -C src $@
 
 GITLOGIN=$(shell git remote -v | head -n 1 | cut -f 1 -d '@' | sed 's/origin\t//g')
@@ -42,3 +43,4 @@ $(TMP)/$(PACKAGE)-$(VERSION): distclean
 	@cp -R $(SOURCES) $(TMP)/$(PACKAGE)-$(VERSION)/ 
 	@chmod -R a+r,u+w,og-w $@
 	@find $@ -type d | xargs -r chmod a+rx,u+w,og-w
+

doc/Changelog

@@ -1,3 +1,21 @@
+sysvinit (3.02) released; urgency=low
+    * Added q and Q flags to synopsis in shutdown manual page.
+    * Applied fixes for markup and spacing in manual pages.
+      Patch provided by Mario Blattermann.
+    * Added translation framework (po4a) from Mario Blttermann.
+    * Added Makefile for man/ directory. Will handle translations
+      and substitutions.
+    * Applied new translations for multiple languages from Mario Blattermann.
+    * Added ability to use "@" symbol in command named in the inittab file. This
+      treats commands as literal and does not launch a shell to interpret them.
+    * Updated inittab manual page to include overview of symbols which trigger
+      a shell interpretor and how to disable them using the @ symbol.
+    * Introduced change which adds error checking in bootlogd when performing
+      chdir(). - Provided by Alexander Vickberg 
+    * Add check for console using TIOCGDEV on Linux systems in bootlogd to
+      make finding console more robust. - Provided by Alexander Vickberg
+
+
 sysvinit (3.01) released; urgency=low
     * Default to showing processes in the uninterruptable state (D).
     The -z flag no longer affects whether processes in D state are shown.

doc/Install

@@ -28,6 +28,9 @@ SysV can be built on virtually any Linux system featuring
 the GNU C library or musl libc. A C compiler, such as the GNU Compiler
 Collection (GCC) or Clang is also required.
 
+On systems which want to provide translated versions of manual pages
+the po4a package should be installed.
+
 Here is a list of preferred directories to install the progs & manpages,
 this should be done for you automatically when you run "make install"
 as the root user, or via sudo, ie "sudo make install".

doc/Propaganda

@@ -71,5 +71,4 @@ The sysvinit package includes
 
 The new SysV init can be found on:
 
-http://download.savannah.nongnu.org/releases/sysvinit/
-
+https://github.com/slicer69/sysvinit

man/Makefile

@@ -0,0 +1,13 @@
+MANPAGES=bootlogd.8 fstab-decode.8 halt.8 init.8 initctl.5 initscript.5 inittab.5 \
+killall5.8 last.1 lastb.1 logsave.8 mesg.1 mountpoint.1 pidof.8 poweroff.8 \
+readbootlog.1 reboot.8 runlevel.8 shutdown.8 sulogin.8 telinit.8 utmpdump.1 \
+wall.1
+
+all install:
+	sed --in-place=.orig --separate 's/\@VERSION\@/$(VERSION)/g' $(MANPAGES)
+
+clean distclean:
+	for man in $(MANPAGES) ; do \
+	   if [ -f "$$man.orig" ] ; then mv "$$man.orig" "$$man" ; fi \
+	done
+

man/bootlogd.8

@@ -15,7 +15,7 @@
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 .\"
-.TH BOOTLOGD 8 "Jul 21, 2003" "" "Linux System Administrator's Manual"
+.TH BOOTLOGD 8 "Jul 21, 2003" "sysvinit " "Linux System Administrator's Manual"
 .SH NAME
 bootlogd \- record boot messages
 .SH SYNOPSIS
@@ -26,25 +26,24 @@ bootlogd \- record boot messages
 .RB [ \-r ]
 .RB [ \-s ]
 .RB [ \-v ]
-.RB [ " -l logfile " ]
-.RB [ " -p pidfile " ]
+.RI [ " \fB-l\fP logfile " ]
+.RI [ " \fB-p\fP pidfile " ]
 .SH DESCRIPTION
-\fBBootlogd\fP runs in the background and copies all strings sent to the
-\fI/dev/console\fP device to a logfile. If the logfile is not accessible,
+\fBbootlogd\fP runs in the background and copies all strings sent to the
+\fI/dev/console\fP device to a logfile. If the \fIlogfile\fP is not accessible,
 the messages will be kept in memory until it is.
 .SH OPTIONS
 .IP \fB\-d\fP
 Do not fork and run in the background.
 .IP \fB\-e\fP
 Print escape characters to the boot log file. This turns off filtering of
-escape characters and allows tools like GNU Less to see and use colour control
-characters (show the log in colour).
+escape characters and allows tools like GNU \fBless\fP(1) to see and use
+colour control characters (show the log in colour).
 .IP \fB\-c\fP
 Attempt to write to the logfile even if it does not yet exist.
-Without this option,
-.B bootlogd
-will wait for the logfile to appear before attempting to write to it.
-This behavior prevents bootlogd from creating logfiles under mount points.
+Without this option, \fBbootlogd\fP will wait for the logfile to appear before
+attempting to write to it. This behavior prevents \fBbootlogd\fP from creating
+logfiles under mount points.
 .IP \fB\-r\fP
 If there is an existing logfile called \fIlogfile\fP rename it to
 \fIlogfile~\fP unless \fIlogfile~\fP already exists.
@@ -61,12 +60,12 @@ Log to this logfile. The default is \fI/var/log/boot\fP.
 .IP "\fB\-p\fP \fIpidfile\fP"
 Put process-id in this file. The default is no pidfile.
 .SH NOTES
-bootlogd saves log data which includes control characters. The log is
+\fBbootlogd\fP saves log data which includes control characters. The log is
 technically a text file, but not very easy for humans to read. To address
-this the readbootlog(1) command can be used to display the boot log
+this the \fBreadbootlog\fP(1) command can be used to display the boot log
 without the control characters.
 .SH BUGS
-Bootlogd works by redirecting the console output from the console device.
+\fBbootlogd\fP works by redirecting the console output from the console device.
 (Consequently \fBbootlogd\fP requires PTY support in the kernel configuration.)
 It copies that output to the real console device and to a log file.
 There is no standard way of ascertaining the real console device
@@ -77,6 +76,10 @@ If that syntax is ever changed by the kernel, or a console type is used that
 \fBbootlogd\fP does not know about then \fBbootlogd\fP will not work.
 
 .SH AUTHOR
-Miquel van Smoorenburg, [email protected]
+.MT miquels@\:cistron\:.nl
+Miquel van Smoorenburg
+.ME
 .SH "SEE ALSO"
-.BR dmesg (8),  fdatasync (3),  readbootlog(1).
+.BR dmesg (8),
+.BR fdatasync (3),
+.BR readbootlog (1)

man/fstab-decode.8

@@ -17,7 +17,7 @@
 .\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .\"
 .\" Author: Miloslav Trmac <[email protected]>
-.TH fstab-decode 8 "May 2006"
+.TH FSTAB-DECODE 8 "May 2006" "sysvinit " "Linux System Administrator's Manual"
 
 .SH NAME
 fstab-decode \- run a command with fstab-encoded arguments
@@ -30,11 +30,9 @@ fstab-decode \- run a command with fstab-encoded arguments
 decodes escapes (such as newline characters and other whitespace) 
 in the specified \fIARGUMENT\fRs and uses them to run \fICOMMAND\fR.
 The argument escaping uses the same rules as path escaping in
-\fB/etc/fstab\fR,
-.B /etc/mtab
-and \fB/proc/mtab\fR.
+\fI/etc/fstab\fR, \fI/etc/mtab\fR and \fI/proc/mtab\fR.
 
-In essence fstab-decode can be used anytime we want to pass multiple
+In essence \fBfstab-decode\fR can be used anytime we want to pass multiple
 parameters to a command as a list of command line arguments. It turns output
 like this:
 
@@ -47,7 +45,7 @@ Into one long list of parameters, "/root /mnt/remote-disk /home". This
 can be useful when trying to work with multiple filesystems at once. For
 instance, we can use it to unmount multiple NFS shares. This program also
 removes whitespace and other characters which might cause programs such
-as mount or umount to fail.
+as \fBmount\fR(8) or \fBumount\fR(8) to fail.
 
 .SH EXIT STATUS
 .B fstab-decode
@@ -57,13 +55,12 @@ can't be run.
 Otherwise it exits with the status returned by \fICOMMAND\fR.
 
 .SH EXAMPLES
-.nf
-The following example reads fstab, finds all instances of VFAT filesystems and
-prints their mount points (argument 2 in the fstab file). fstab-decode then runs 
-the specified program, umount, and passes it the list of VFAT mountpoints. 
-This unmounts all VFAT partitions.
-
+The following example reads \fIfstab\fR, finds all instances of VFAT filesystems
+and prints their mount points (argument 2 in the \fIfstab\fR file).
+\fBfstab-decode\fR then runs the specified program, \fBumount\fR(8), and passes
+it the list of VFAT mountpoints. This unmounts all VFAT partitions.
 
+.nf
 .B fstab-decode umount $(awk \[aq]$3 == \[dq]vfat\[dq] { print $2 }\[aq] /etc/fstab)
 .fi
 

man/halt.8

@@ -17,11 +17,11 @@
 .\"
 .\"{{{}}}
 .\"{{{  Title
-.TH HALT 8 "Nov 6, 2001" "" "Linux System Administrator's Manual"
+.TH HALT 8 "Nov 6, 2001" "sysvinit " "Linux System Administrator's Manual"
 .\"}}}
 .\"{{{  Name
 .SH NAME
-halt, reboot, poweroff \- stop the system.
+halt, reboot, poweroff \- stop the system
 .\"}}}
 .\"{{{  Synopsis
 .SH SYNOPSIS
@@ -61,7 +61,7 @@ normally, \fBshutdown\fP will be invoked instead (with the \fB-h\fP
 or \fB-r\fP flag). For more info see the \fBshutdown\fP(8)
 manpage.
 .PP
-The rest of this manpage describes the behaviour in runlevels 0
+The rest of this manpage describes the behavior in runlevels 0
 and 6, that is when the systems shutdown scripts are being run.
 .\"}}}
 .\"{{{  Options
@@ -77,13 +77,13 @@ Don't write the wtmp record.
 .IP \fB\-f\fP
 Force halt or reboot, don't call \fBshutdown\fP(8).
 .IP \fB\-i\fP
-Shut down all network interfaces just before halt or reboot.
+Shut down all network interfaces just before \fBhalt\fR or \fBreboot\fR.
 Warning: This may not work on interfaces which do not have an IP address
 and should ideally be handled by a network manager service.
 .IP \fB\-h\fP
 Put all hard drives on the system in stand-by mode just before halt or power-off.
 .IP \fB\-p\fP
-When halting the system, switch off the power. This is the default when halt is
+When halting the system, switch off the power. This is the default when \fBhalt\fR is
 called as \fBpoweroff\fP.
 .\"}}}
 .\"{{{  Diagnostics
@@ -92,12 +92,12 @@ If you're not the superuser, you will get the message `must be superuser'.
 .\"}}}
 .\"{{{  Notes
 .SH NOTES
-Under older \fBsysvinit\fP releases , \fBreboot\fP and \fBhalt\fP should
+Under older \fBsysvinit\fP releases, \fBreboot\fP and \fBhalt\fP should
 never be called directly. From release 2.74 on \fBhalt\fP and \fBreboot\fP
 invoke \fBshutdown\fP(8) if the system is not in runlevel 0 or 6. This
 means that if \fBhalt\fP or \fBreboot\fP cannot find out the current
 runlevel (for example, when \fI/var/run/utmp\fP hasn't been initialized
-correctly and /var/run/runlevel does not exist) \fBshutdown\fP will be called, 
+correctly and \fI/var/run/runlevel\fR does not exist) \fBshutdown\fP will be called, 
 which might not be what you want.
 Use the \fB-f\fP flag if you want to do a hard \fBhalt\fP or \fBreboot\fP.
 .PP
@@ -107,14 +107,16 @@ effect of putting the drive in stand-by mode is that the write cache
 on the disk is flushed. This is important for IDE drives, since the
 kernel doesn't flush the write cache itself before power-off.
 .PP
-The \fBhalt\fP program uses /proc/ide/hd* to find all IDE disk devices,
+The \fBhalt\fP program uses \fI/proc/ide/hd*\fR to find all IDE disk devices,
 which means that \fI/proc\fP needs to be mounted when \fBhalt\fP or
 \fBpoweroff\fP is called or the \fB-h\fP switch will do nothing.
 .PP
 .\"}}}
 .\"{{{  Author
 .SH AUTHOR
-Miquel van Smoorenburg, [email protected]
+.MT miquels@\:cistron\:.nl
+Miquel van Smoorenburg
+.ME
 .\"}}}
 .\"{{{  See also
 .SH "SEE ALSO"