From a14e36bf66ceef26797217638857f3cf93873890 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 2 Aug 2012 01:39:14 +0200 Subject: rc.sysinit: fix adjtime warning This never worked. Reported-by: James Gordon Signed-off-by: Tom Gundersen --- rc.sysinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.sysinit b/rc.sysinit index c8f6360..e1a1081 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -139,7 +139,7 @@ stat_busy "Saving dmesg log" (( $? == 0 )) && stat_done || stat_fail if [[ -f /etc/adjtime ]]; then - ( read ; read ; read ADJTIME) < /etc/adjtime + { read ; read ; read ADJTIME; } < /etc/adjtime if [[ $ADJTIME == 'LOCAL' ]]; then if [[ $HARDWARECLOCK == 'UTC' ]]; then -- cgit v1.2.3 From 71d5dbd0443cde15505ae8a7a00655d77bdb6463 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 2 Aug 2012 01:43:49 +0200 Subject: lvm: fix activation of lvm after cryptestup The check was inverted. Just do this unconditionally. Signed-off-by: Tom Gundersen --- rc.sysinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.sysinit b/rc.sysinit index e1a1081..eb49e2b 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -80,7 +80,7 @@ activate_vgs if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then read_crypttab do_unlock # Maybe someone has LVM on an encrypted block device - (( $? )) && activate_vgs + activate_vgs fi # Check filesystems -- cgit v1.2.3 From e512556f06a9df59794da393bc092dcf5adbcc69 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 2 Aug 2012 23:47:58 +0200 Subject: man: clarify symlinking in archlinux(7) This is a bit different from the other instructions, so make it extra clear. Reported-by: Myra Nelson Signed-off-by: Tom Gundersen --- archlinux.7.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archlinux.7.txt b/archlinux.7.txt index 9cf1857..173c730 100644 --- a/archlinux.7.txt +++ b/archlinux.7.txt @@ -40,7 +40,7 @@ other things. Note that these settings only apply to the console, and not if you TIME[[T]] --------- -The local timezone is configured by symlinking /etc/localtime to the correct zoneinfo file under +The local timezone is configured by *symlinking* /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. E.g., /etc/localtime -> /usr/share/zoneinfo/Europe/Paris -- cgit v1.2.3 From 3858aec656fc4fbfff3c296ca39148e7bea6f83d Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Thu, 2 Aug 2012 11:25:25 -0400 Subject: archlinux.7: fix reference to syslinux config file Signed-off-by: Dave Reisner --- archlinux.7.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archlinux.7.txt b/archlinux.7.txt index 173c730..32517fb 100644 --- a/archlinux.7.txt +++ b/archlinux.7.txt @@ -62,7 +62,7 @@ The package manager, pacman, is configured in /etc/pacman.conf. BOOTLOADER[[B]] --------------- -GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.conf +GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.cfg MODULES[[M]] ------------ -- cgit v1.2.3 From feb7b6e36af0bcf05c20abbaa548ecae170903a8 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 3 Aug 2012 19:31:11 +0200 Subject: network: fix warning on trying to start a running network Reported-by: Ali Kaasinen Signed-off-by: Tom Gundersen --- network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network b/network index b28c523..b8b6989 100755 --- a/network +++ b/network @@ -223,7 +223,7 @@ case "$1" in # deprecation check need_legacy && deprecated if ! ck_daemon network; then - echo "Network is already running. Try 'network restart'" + echo "Network is already running. Try 'rc.d restart network'" exit fi stat_busy "Starting network" -- cgit v1.2.3 From e060bec18062ae0a0f719200523880476017c1e0 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 4 Aug 2012 00:43:42 +0200 Subject: modprobe: pass everything to systemd-modules-load Unify this as much as possible, write out MODULES to a modules-load.d file in /run before calling systemd-modules-load, rather than using modprobe directly. This should not make any difference to the functionality. Signed-off-by: Tom Gundersen --- functions | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/functions b/functions index fee1765..e8ff7b8 100644 --- a/functions +++ b/functions @@ -357,14 +357,14 @@ print_welcome() { load_modules() { local rc=0 - /usr/lib/systemd/systemd-modules-load &>/dev/null - rc=$? - - if (( ${#MODULES[*]} )); then - modprobe -ab "${MODULES[@]}" - (( rc += $? )) + if [[ $MODULES ]]; then + /usr/lib/systemd/arch-modules-load + rc=$? fi + /usr/lib/systemd/systemd-modules-load + (( rc+=$? )) + return $rc } -- cgit v1.2.3 From a6c6009011f3544ff737c2078b44aff20396a539 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 4 Aug 2012 16:11:06 +0200 Subject: systemd: mask netfs.service The compat layer might attempt to start this, but that is never necessary, as systemd deals with remote-fs internally. Signed-off-by: Tom Gundersen --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 74808e5..f810c96 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ install: installdirs doc install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/initscripts.conf install -m644 -T bash-completion $(DESTDIR)/usr/share/bash-completion/completions/rc.d install -m644 -T zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_rc.d + ln -s /dev/null ${DESTDIR}/usr/lib/systemd/system/netfs.service ln -s ../rc-local.service ${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/ ln -s ../rc-local-shutdown.service ${DESTDIR}/usr/lib/systemd/system/shutdown.target.wants/ ln -s ../arch-modules-load.service ${DESTDIR}/usr/lib/systemd/system/sysinit.target.wants/ -- cgit v1.2.3 From 9c4808d333758205b689ffc37c561d268e7faf53 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 9 Aug 2012 22:55:12 +0200 Subject: arch-modules-load, arch-daemons: add manpages 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 --- Makefile | 6 +++--- arch-daemons | 2 +- arch-daemons.8.txt | 37 +++++++++++++++++++++++++++++++++++++ arch-modules-load.8.txt | 35 +++++++++++++++++++++++++++++++++++ arch-modules-load.service | 2 +- 5 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 arch-daemons.8.txt create mode 100644 arch-modules-load.8.txt 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 -- cgit v1.2.3 From ac6b435d40c8295fcc0fc4cb751ccd092a77e433 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 11 Aug 2012 04:29:07 +0200 Subject: man: fix path to arch-daemons generator Signed-off-by: Tom Gundersen --- arch-daemons.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-daemons.8.txt b/arch-daemons.8.txt index 1b46035..2c0071e 100644 --- a/arch-daemons.8.txt +++ b/arch-daemons.8.txt @@ -10,7 +10,7 @@ arch-daemons - Compatibility layer for rc scripts and rc.conf's DAEMONS array SYNOPSIS -------- -/usr/lib/systemd/arch-daemons +/usr/lib/systemd/system-generators/arch-daemons DESCRIPTION ----------- -- cgit v1.2.3 From a969f05ed3ead0f422c14dd750197f201f7ebb15 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 11 Aug 2012 13:19:21 -0400 Subject: functions: support UUID tags in /etc/crypttab As per crypttab(5), this is supported. This also adds forward looking support for PARTUUID, which is valid and should "just work" for GPT partitioned disks. Signed-off-by: Dave Reisner --- functions | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/functions b/functions index e8ff7b8..e6b9af3 100644 --- a/functions +++ b/functions @@ -475,6 +475,16 @@ do_unlock_legacy() { do_unlock_systemd() { local name=$1 device=$2 password=$3 options=$4 failed=0 + # lazily convert tags to udev symlinks + case $device in + UUID=*) + device=/dev/disk/by-uuid/${device#UUID=} + ;; + PARTUUID=*) + device=/dev/disk/by-partuuid/${device#PARTUUID=} + ;; + esac + if ! /usr/lib/systemd/systemd-cryptsetup attach "$name" "$device" "$password" $options; then failed=1 else -- cgit v1.2.3 From e2382e7ed838747052355527c87be6763c581ba2 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 11 Aug 2012 19:19:21 -0400 Subject: functions: support quoted UUID/PARTUUID in crypttab Abstract the unquoting logic from parse_envfile into unquote() and reuse it for our crypttab unlock logic. Signed-off-by: Dave Reisner --- functions | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/functions b/functions index e6b9af3..eb08ba6 100644 --- a/functions +++ b/functions @@ -72,9 +72,19 @@ unset TZ # sanitize the locale settings unset "${localevars[@]}" +unquote() { + local -r quotes=$'[\'"]' + + if [[ ${1:0:1} = $quotes && ${1:(-1)} = "${1:0:1}" ]]; then + printf '%s' "${1:1:(-1)}" + else + printf '%s' "$1" + fi +} + parse_envfile() { local file=$1 validkeys=("${@:2}") ret=0 lineno=0 key= val= - local -r quotes=$'[\'"]' comments=$'[;#]*' + local -r comments=$'[;#]*' if [[ -z $file ]]; then printf "error: no environment file specified\n" @@ -101,8 +111,7 @@ parse_envfile() { [[ -z $key || ${key:0:1} = $comments ]] && continue # trim whitespace, strip matching quotes - val=$(echo "$val" | { read -r val; echo "$val"; }) - [[ ${val:0:1} = $quotes && ${val:(-1)} = "${val:0:1}" ]] && val=${val:1:(-1)} + val=$(echo "$val" | { read -r val; unquote "$val"; }) if [[ -z $val ]]; then printf "error: found key \`%s' without value on line %s of %s\n" \ @@ -478,10 +487,10 @@ do_unlock_systemd() { # lazily convert tags to udev symlinks case $device in UUID=*) - device=/dev/disk/by-uuid/${device#UUID=} + device=/dev/disk/by-uuid/$(unquote "${device#UUID=}") ;; PARTUUID=*) - device=/dev/disk/by-partuuid/${device#PARTUUID=} + device=/dev/disk/by-partuuid/$(unquote "${device#PARTUUID=}") ;; esac -- cgit v1.2.3 From 05d0b4ec34bb95ad0e0e139e299e388e689d7c91 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 12 Aug 2012 01:38:03 +0200 Subject: update .gitignore Signed-off-by: Tom Gundersen --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e365ecb..c068949 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,8 @@ hostname.5 locale.conf.5 vconsole.conf.5 rc.conf.5 +archlinux.7 +arch-daemons.8 +arch-modules-load.8 rc.d.8 pkg/ -- cgit v1.2.3 From 1ed7d0e48dae3f9d43929fc9033042ebe39d2c3e Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 12 Aug 2012 14:59:33 +0200 Subject: cryptsetup: support the password being unset --- functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions b/functions index eb08ba6..66e2242 100644 --- a/functions +++ b/functions @@ -536,7 +536,7 @@ do_unlock() { do_unlock_legacy "$name" "$device" "$password" "$options" fi ;; - /*|none|-) + /*|none|-|'') do_unlock_systemd "$name" "$device" "$password" "$options" ;; *) -- cgit v1.2.3 From bf6c04d342f258a0caf26291fb06d036c5c902a7 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 16 Aug 2012 21:39:11 +0200 Subject: systemd: fix typos in service files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Thomas Weißschuh Signed-off-by: Tom Gundersen --- rc-local-shutdown.service | 2 +- rc-local.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rc-local-shutdown.service b/rc-local-shutdown.service index 5f672f7..2d0715c 100644 --- a/rc-local-shutdown.service +++ b/rc-local-shutdown.service @@ -1,6 +1,6 @@ [Unit] Description=/etc/rc.local.shutdown Compatibility -ConditionPathIsExecutable=/etc/rc.local.shutdown +ConditionFileIsExecutable=/etc/rc.local.shutdown DefaultDependencies=no After=rc-local.service basic.target Before=shutdown.target diff --git a/rc-local.service b/rc-local.service index 6c4c412..b17b091 100644 --- a/rc-local.service +++ b/rc-local.service @@ -1,6 +1,6 @@ [Unit] Description=/etc/rc.local Compatibility -ConditionPathIsExecutable=/etc/rc.local +ConditionFileIsExecutable=/etc/rc.local [Service] Type=oneshot -- cgit v1.2.3 From 137302c545006f0c4e89616f1c0e6cc2a7294969 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Sat, 18 Aug 2012 10:06:51 +0200 Subject: Add special target for rc.conf DAEMONS This (re)introduces arch-daemons.target, so a simple systemctl mask arch-daemons.target will suppress the starting of DAEMONS from rc.conf. Signed-off-by: Jan Alexander Steffens (heftig) --- Makefile | 3 ++- arch-daemons | 6 +++--- arch-daemons.target | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 arch-daemons.target diff --git a/Makefile b/Makefile index ac307e2..5829fd9 100644 --- a/Makefile +++ b/Makefile @@ -35,12 +35,13 @@ install: installdirs doc 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 + install -m644 -t $(DESTDIR)/usr/lib/systemd/system arch-modules-load.service rc-local.service rc-local-shutdown.service arch-daemons.target install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/initscripts.conf install -m644 -T bash-completion $(DESTDIR)/usr/share/bash-completion/completions/rc.d install -m644 -T zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_rc.d ln -s /dev/null ${DESTDIR}/usr/lib/systemd/system/netfs.service ln -s ../rc-local.service ${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/ + ln -s ../arch-daemons.target ${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/ ln -s ../rc-local-shutdown.service ${DESTDIR}/usr/lib/systemd/system/shutdown.target.wants/ ln -s ../arch-modules-load.service ${DESTDIR}/usr/lib/systemd/system/sysinit.target.wants/ diff --git a/arch-daemons b/arch-daemons index edb4dcb..b4398b4 100755 --- a/arch-daemons +++ b/arch-daemons @@ -47,18 +47,18 @@ for daemon in /etc/rc.d/*; do create_unit "${daemon##*/}".service done -[[ -d $dest/multi-user.target.wants ]] || /bin/mkdir -p "$dest/multi-user.target.wants" +[[ -d $dest/arch-daemons.target.wants ]] || /bin/mkdir -p "$dest/arch-daemons.target.wants" for daemon in "${DAEMONS[@]}"; do service="$daemon.service" case ${daemon:0:1} in '!') continue ;; '@') create_unit "${service:1}" "${deps[@]}" - ln -s "../${service:1}" "$dest/multi-user.target.wants" + ln -s "../${service:1}" "$dest/arch-daemons.target.wants" ;; *) create_unit "$service" "${deps[@]}" deps+=("$service") - ln -s "../$service" "$dest/multi-user.target.wants" + ln -s "../$service" "$dest/arch-daemons.target.wants" ;; esac done diff --git a/arch-daemons.target b/arch-daemons.target new file mode 100644 index 0000000..3a8ba1d --- /dev/null +++ b/arch-daemons.target @@ -0,0 +1,2 @@ +[Unit] +Description=Arch Daemons -- cgit v1.2.3 From 7ed504aa3685e9747b64ca3e857f215c733a0d2c Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Sat, 18 Aug 2012 10:06:52 +0200 Subject: Remove SourcePath from arch-modules-load.service This setting is intended for dynamically created units. Signed-off-by: Jan Alexander Steffens (heftig) --- arch-modules-load.service | 1 - 1 file changed, 1 deletion(-) diff --git a/arch-modules-load.service b/arch-modules-load.service index 269241f..829e37a 100644 --- a/arch-modules-load.service +++ b/arch-modules-load.service @@ -1,5 +1,4 @@ [Unit] -SourcePath=/etc/rc.conf Documentation=man:arch-modules-load(8) Description=Load modules defined in rc.conf DefaultDependencies=no -- cgit v1.2.3 From 4d7e439bfa8afddf9ba6852b6a44190a5c0894ea Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 20 Aug 2012 16:27:19 +0200 Subject: arch-daemons.target: add link to documentation --- arch-daemons.target | 1 + 1 file changed, 1 insertion(+) diff --git a/arch-daemons.target b/arch-daemons.target index 3a8ba1d..578e8d7 100644 --- a/arch-daemons.target +++ b/arch-daemons.target @@ -1,2 +1,3 @@ [Unit] Description=Arch Daemons +Documentation=man:arch-daemons(8) -- cgit v1.2.3 From 7e019c49b21cf2e975ff7d8b2bedf3bb2477d1c6 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 20 Aug 2012 16:32:04 +0200 Subject: arch-daemons.target: add some documentation The point of the target is to allow it to be masked so DAEMONS will be ignored. Document this. --- arch-daemons.8.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch-daemons.8.txt b/arch-daemons.8.txt index 2c0071e..bad5c9c 100644 --- a/arch-daemons.8.txt +++ b/arch-daemons.8.txt @@ -6,7 +6,7 @@ arch-daemons(8) NAME ---- -arch-daemons - Compatibility layer for rc scripts and rc.conf's DAEMONS array +arch-daemons, arch-daemons.target - Compatibility layer for rc scripts and rc.conf's DAEMONS array SYNOPSIS -------- @@ -27,6 +27,9 @@ Note: this is meant as a compatibility layer only for the purposes of easing use from initscripts to systemd. You are strongly encouraged to not rely on this, but rather use native systemd services. +The generated services that are enabled in the DAEMONS array is pulled in via arch-daemons.target. +arch-daemons.target can be masked in order to ignore the DAEMONS array when booting with systemd. + SEE ALSO -------- -- cgit v1.2.3