From e6aad08ba82e44e88f9186eab30c68ceaf6370a3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 17 May 2010 02:17:47 +0200 Subject: [PATCH] units: fix commenting --- units/basic.target.m4 | 7 ++++--- units/fedora/halt.service | 2 -- units/fedora/killall.service | 2 -- units/fedora/poweroff.service | 2 -- units/fedora/prefdm.service | 2 -- units/fedora/rc-local.service | 2 -- units/fedora/reboot.service | 2 -- units/fedora/sysinit.service | 2 -- units/getty@.service.m4 | 7 +++---- units/graphical.target.m4 | 7 ++++--- units/multi-user.target.m4 | 7 ++++--- 11 files changed, 15 insertions(+), 27 deletions(-) diff --git a/units/basic.target.m4 b/units/basic.target.m4 index 437e33d5e..c31a8f681 100644 --- a/units/basic.target.m4 +++ b/units/basic.target.m4 @@ -21,8 +21,9 @@ Description=Basic System Requires=local-fs.target swap.target sockets.target After=local-fs.target swap.target sockets.target - +m4_dnl m4_ifdef(`TARGET_FEDORA', -# Hook in Fedora's /etc/rc.d/rc.sysinit +m4_dnl Hook in Fedora's /etc/rc.d/rc.sysinit Requires=sysinit.service -After=sysinit.service) +After=sysinit.service +)m4_dnl diff --git a/units/fedora/halt.service b/units/fedora/halt.service index 372b7e6f5..acc47b503 100644 --- a/units/fedora/halt.service +++ b/units/fedora/halt.service @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with systemd; If not, see . -# See systemd.special(7) for details - [Unit] Description=Halt Requires=shutdown.target killall.service diff --git a/units/fedora/killall.service b/units/fedora/killall.service index 1a6d47f39..45868dd17 100644 --- a/units/fedora/killall.service +++ b/units/fedora/killall.service @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with systemd; If not, see . -# See systemd.special(7) for details - [Unit] Description=Kill All Processes diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service index 82b9fac15..758b7ca23 100644 --- a/units/fedora/poweroff.service +++ b/units/fedora/poweroff.service @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with systemd; If not, see . -# See systemd.special(7) for details - [Unit] Description=Power-Off Requires=shutdown.target killall.service diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service index 6ee35031d..7df09ac84 100644 --- a/units/fedora/prefdm.service +++ b/units/fedora/prefdm.service @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with systemd; If not, see . -# See systemd.special(7) for details - [Unit] Description=Display Manager Before=graphical.target diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service index b3ece1ed1..099bbabcd 100644 --- a/units/fedora/rc-local.service +++ b/units/fedora/rc-local.service @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with systemd; If not, see . -# See systemd.special(7) for details - [Unit] Description=/etc/rc.local Compatibility Requires=basic.target diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service index 45a293497..9aec7aaac 100644 --- a/units/fedora/reboot.service +++ b/units/fedora/reboot.service @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with systemd; If not, see . -# See systemd.special(7) for details - [Unit] Description=Reboot Requires=shutdown.target killall.service diff --git a/units/fedora/sysinit.service b/units/fedora/sysinit.service index fc7145300..0d59490f9 100644 --- a/units/fedora/sysinit.service +++ b/units/fedora/sysinit.service @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with systemd; If not, see . -# See systemd.special(7) for details - [Unit] Description=System Initialization Before=local-fs.target remote-fs.target swap.target sockets.target diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index b4dfaf24e..b95124880 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -15,10 +15,9 @@ # You should have received a copy of the GNU General Public License # along with systemd; If not, see . -# See systemd.special(7) for details -m4_ifdef(`TARGET_FEDORA', m4_define(`GETTY', `/sbin/mingetty'))m4_dnl -m4_ifdef(`TARGET_DEBIAN', m4_define(`GETTY', `/sbin/getty 38400'))m4_dnl - +m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl +m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl +m4_dnl [Unit] Description=Getty on %I Before=getty.target diff --git a/units/graphical.target.m4 b/units/graphical.target.m4 index 151ad6bb1..cb8e811a8 100644 --- a/units/graphical.target.m4 +++ b/units/graphical.target.m4 @@ -21,7 +21,8 @@ Description=Graphical Interface Requires=multi-user.target After=multi-user.target - +m4_dnl m4_ifdef(`TARGET_FEDORA', -# On Fedora Runlevel 5 is graphical login -Names=runlevel5.target) +m4_dnl On Fedora Runlevel 5 is graphical login +Names=runlevel5.target +)m4_dnl diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4 index a841f9a96..b7f5f152a 100644 --- a/units/multi-user.target.m4 +++ b/units/multi-user.target.m4 @@ -21,7 +21,8 @@ Description=Multi-User Requires=basic.target After=basic.target - +m4_dnl m4_ifdef(`TARGET_FEDORA', -# On Fedora Runlevel 3 is multi-user -Names=runlevel3.target) +m4_dnl On Fedora Runlevel 3 is multi-user +Names=runlevel3.target +)m4_dnl -- 2.30.2