aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-08-09 20:55:12 (GMT)
committerTom Gundersen <teg@jklm.no>2012-08-09 21:21:24 (GMT)
commit9c4808d333758205b689ffc37c561d268e7faf53 (patch)
tree5a27928a488474f0fd3ae1ccc60f71f38783a1c3
parenta6c6009011f3544ff737c2078b44aff20396a539 (diff)
downloadinitscripts-2012.08.2.tar.xz
arch-modules-load, arch-daemons: add manpages2012.08.2
Rather than pointing to the documentation online, include the documentation here. The main point with the documentation is to point out that these things should not be used. Signed-off-by: Tom Gundersen <teg@jklm.no>
-rw-r--r--Makefile6
-rwxr-xr-xarch-daemons2
-rw-r--r--arch-daemons.8.txt37
-rw-r--r--arch-modules-load.8.txt35
-rw-r--r--arch-modules-load.service2
5 files changed, 77 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index f810c96..ac307e2 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ install: installdirs doc
install -m755 -t $(DESTDIR)/usr/sbin rc.d
install -m644 -t $(DESTDIR)/usr/share/man/man5 rc.conf.5
install -m644 -t $(DESTDIR)/usr/share/man/man7 archlinux.7
- install -m644 -t $(DESTDIR)/usr/share/man/man8 rc.d.8
+ install -m644 -t $(DESTDIR)/usr/share/man/man8 rc.d.8 arch-modules-load.8 arch-daemons.8
install -m755 -t $(DESTDIR)/usr/lib/systemd/system-generators arch-daemons
install -m755 -t $(DESTDIR)/usr/lib/systemd arch-modules-load
install -m644 -t $(DESTDIR)/usr/lib/systemd/system arch-modules-load.service rc-local.service rc-local-shutdown.service
@@ -53,10 +53,10 @@ install: installdirs doc
%.8: %.8.txt
a2x -d manpage -f manpage $<
-doc: rc.conf.5 archlinux.7 rc.d.8
+doc: rc.conf.5 archlinux.7 rc.d.8 arch-modules-load.8 arch-daemons.8
clean:
- rm -f rc.conf.5 archlinux.7 rc.d.8
+ rm -f rc.conf.5 archlinux.7 rc.d.8 arch-modules-load.8 arch-daemons.8
tar:
git archive HEAD --prefix=initscripts-$(VER)/ | xz > initscripts-$(VER).tar.xz
diff --git a/arch-daemons b/arch-daemons
index ffe4289..edb4dcb 100755
--- a/arch-daemons
+++ b/arch-daemons
@@ -31,7 +31,7 @@ create_unit() {
printf \
'[Unit]
SourcePath=/etc/rc.conf
-Documentation=https://raw.github.com/falconindy/initscripts-systemd/master/README
+Documentation=man:arch-daemons(8)
Description=Legacy unit for %s
%s
[Service]
diff --git a/arch-daemons.8.txt b/arch-daemons.8.txt
new file mode 100644
index 0000000..1b46035
--- /dev/null
+++ b/arch-daemons.8.txt
@@ -0,0 +1,37 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+arch-daemons(8)
+===============
+
+NAME
+----
+arch-daemons - Compatibility layer for rc scripts and rc.conf's DAEMONS array
+
+SYNOPSIS
+--------
+/usr/lib/systemd/arch-daemons
+
+DESCRIPTION
+-----------
+arch-daemons is executed by systemd at very early boot. It has two purposes:
+
+ * For every rc script in /etc/rc.d/ a wrapper service file is created which will start and stop
+ daemons by calling the corresponding rc script. In case a native systemd service file exists
+ with the same name, the legacy one is ignored and the native one is used instead.
+ * The DAEMONS array in rc.conf is parsed and every daemon that appears there is enabled at boot.
+ Furthermore, the ordering dependencies specified in the DAEMONS array is respected (including
+ backgrounding).
+
+Note: this is meant as a compatibility layer only for the purposes of easing users' transition
+from initscripts to systemd. You are strongly encouraged to not rely on this, but rather use
+native systemd services.
+
+SEE ALSO
+--------
+
+rc.conf(5), systemd(1)
+
+AUTHORS
+-------
+Written by Tom Gundersen.
diff --git a/arch-modules-load.8.txt b/arch-modules-load.8.txt
new file mode 100644
index 0000000..cffad32
--- /dev/null
+++ b/arch-modules-load.8.txt
@@ -0,0 +1,35 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+arch-modules-load(8)
+====================
+
+NAME
+----
+arch-modules-load, arch-modules-load.service - Compatibility layer for rc.conf's MODULES array
+
+SYNOPSIS
+--------
+/usr/lib/systemd/arch-modules-load
+
+arch-modules-load.service
+
+DESCRIPTION
+-----------
+Parses the MODULES array from rc.conf at early boot and passes on the list of modules to load to
+systemd-modules-load.
+
+arch-modules-load and systemd-modules-load are used the same by both initscripts and systemd.
+
+Note: this is meant as a compatibility layer only for the purposes of easing users' transition from
+the old rc.conf syntax to the new systemd syntax. You are strongly encouraged to not rely on this,
+but rather use the native modules-load.d configuration format.
+
+SEE ALSO
+--------
+
+rc.conf(5), systemd-modules-load(8), modules-load.d(5)
+
+AUTHORS
+-------
+Written by Tom Gundersen.
diff --git a/arch-modules-load.service b/arch-modules-load.service
index f400d48..269241f 100644
--- a/arch-modules-load.service
+++ b/arch-modules-load.service
@@ -1,6 +1,6 @@
[Unit]
SourcePath=/etc/rc.conf
-Documentation=https://raw.github.com/falconindy/initscripts-systemd/master/README
+Documentation=man:arch-modules-load(8)
Description=Load modules defined in rc.conf
DefaultDependencies=no
Before=systemd-modules-load.service