From 75854bbd5f7d2ef05c3dd8e4bd2bbcc614daec68 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 6 Oct 2012 17:02:45 +0200 Subject: arch-modules-load: drop from systemd compat layer We now no longer support reading the MODULES array when booting with systemd. The support is kept in initscripts (though a warning is printed) for sake of compatibility. Both initscripts and systemd should be using the new modules-load.d syntax and we should remove all mention of the old from varios documentation, for the sake of simplicity. Signed-off-by: Tom Gundersen --- Makefile | 3 +-- arch-modules-load.8.txt | 7 +++---- arch-modules-load.service | 9 --------- 3 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 arch-modules-load.service diff --git a/Makefile b/Makefile index 3e24926..0519af7 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ 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 arch-daemons.target + install -m644 -t $(DESTDIR)/usr/lib/systemd/system 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 @@ -39,7 +39,6 @@ install: installdirs doc 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/ %.5: %.5.txt a2x -d manpage -f manpage $< diff --git a/arch-modules-load.8.txt b/arch-modules-load.8.txt index cffad32..a16f780 100644 --- a/arch-modules-load.8.txt +++ b/arch-modules-load.8.txt @@ -6,20 +6,19 @@ arch-modules-load(8) NAME ---- -arch-modules-load, arch-modules-load.service - Compatibility layer for rc.conf's MODULES array +arch-modules-load - 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. +arch-modules-load is only used by initscripts, and systemd-modules-load is 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, diff --git a/arch-modules-load.service b/arch-modules-load.service deleted file mode 100644 index 829e37a..0000000 --- a/arch-modules-load.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Documentation=man:arch-modules-load(8) -Description=Load modules defined in rc.conf -DefaultDependencies=no -Before=systemd-modules-load.service - -[Service] -ExecStart=/usr/lib/systemd/arch-modules-load -Type=oneshot -- cgit v1.2.3