chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb1bd35
)
units: fix commenting
author
Lennart Poettering
<lennart@poettering.net>
Mon, 17 May 2010 00:17:47 +0000
(
02:17
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 17 May 2010 00:17:47 +0000
(
02:17
+0200)
units/basic.target.m4
patch
|
blob
|
history
units/fedora/halt.service
patch
|
blob
|
history
units/fedora/killall.service
patch
|
blob
|
history
units/fedora/poweroff.service
patch
|
blob
|
history
units/fedora/prefdm.service
patch
|
blob
|
history
units/fedora/rc-local.service
patch
|
blob
|
history
units/fedora/reboot.service
patch
|
blob
|
history
units/fedora/sysinit.service
patch
|
blob
|
history
units/getty@.service.m4
patch
|
blob
|
history
units/graphical.target.m4
patch
|
blob
|
history
units/multi-user.target.m4
patch
|
blob
|
history
diff --git
a/units/basic.target.m4
b/units/basic.target.m4
index 437e33d5e64cfadc42c0fc65d704caaabf592c1b..c31a8f681ef262760de01d2995e48c6a8b043f9c 100644
(file)
--- 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
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',
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
Requires=sysinit.service
-After=sysinit.service)
+After=sysinit.service
+)m4_dnl
diff --git
a/units/fedora/halt.service
b/units/fedora/halt.service
index 372b7e6f518b5a8734d521dd9d9fd2940c6647a9..acc47b503dd667e05a001430900201c93d7e62d4 100644
(file)
--- 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 <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-# See systemd.special(7) for details
-
[Unit]
Description=Halt
Requires=shutdown.target killall.service
[Unit]
Description=Halt
Requires=shutdown.target killall.service
diff --git
a/units/fedora/killall.service
b/units/fedora/killall.service
index 1a6d47f39c92f1cce9912a046a214a330152f463..45868dd1733b71da307ea10027201acedd1e1b0f 100644
(file)
--- 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 <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-# See systemd.special(7) for details
-
[Unit]
Description=Kill All Processes
[Unit]
Description=Kill All Processes
diff --git
a/units/fedora/poweroff.service
b/units/fedora/poweroff.service
index 82b9fac159264346702b97cd0457fd0ac336ddff..758b7ca237adac9fb9d898273bf995628501f3bb 100644
(file)
--- 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 <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-# See systemd.special(7) for details
-
[Unit]
Description=Power-Off
Requires=shutdown.target killall.service
[Unit]
Description=Power-Off
Requires=shutdown.target killall.service
diff --git
a/units/fedora/prefdm.service
b/units/fedora/prefdm.service
index 6ee35031d9de1e17d856e344972515b7a7b94618..7df09ac84d09e8e1f760d48acc82fbf97a57528b 100644
(file)
--- 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 <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-# See systemd.special(7) for details
-
[Unit]
Description=Display Manager
Before=graphical.target
[Unit]
Description=Display Manager
Before=graphical.target
diff --git
a/units/fedora/rc-local.service
b/units/fedora/rc-local.service
index b3ece1ed1b7e0a9d646770e5c3f36389bb37466f..099bbabcd6086527e6808597beff4dc3e529d7fd 100644
(file)
--- 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 <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-# See systemd.special(7) for details
-
[Unit]
Description=/etc/rc.local Compatibility
Requires=basic.target
[Unit]
Description=/etc/rc.local Compatibility
Requires=basic.target
diff --git
a/units/fedora/reboot.service
b/units/fedora/reboot.service
index 45a2934972018da9471260ef396e3c0152a64568..9aec7aaac68a2ce986a210d3712e75ab75e54a33 100644
(file)
--- 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 <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-# See systemd.special(7) for details
-
[Unit]
Description=Reboot
Requires=shutdown.target killall.service
[Unit]
Description=Reboot
Requires=shutdown.target killall.service
diff --git
a/units/fedora/sysinit.service
b/units/fedora/sysinit.service
index fc71453007256a1643213749c58928b33a7337f9..0d59490f90daf0fe54d6f411dac4b487267d51a6 100644
(file)
--- 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 <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-# See systemd.special(7) for details
-
[Unit]
Description=System Initialization
Before=local-fs.target remote-fs.target swap.target sockets.target
[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 b4dfaf24e1c02f14fb72059f0cfbb4627de0563b..b95124880ca77038cdcec6ad16b1f2968dacf21e 100644
(file)
--- 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 <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-# 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
[Unit]
Description=Getty on %I
Before=getty.target
diff --git
a/units/graphical.target.m4
b/units/graphical.target.m4
index 151ad6bb1254b759c9bfc029bba7cec4f7d14eba..cb8e811a8b4fd09a4f48118f9140667ba531854b 100644
(file)
--- 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
Description=Graphical Interface
Requires=multi-user.target
After=multi-user.target
-
+m4_dnl
m4_ifdef(`TARGET_FEDORA',
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 a841f9a964ffc769cfd8a6a160cb8701eb7f8e25..b7f5f152ac8ea467ef3334efa3c023cd26c9aaf7 100644
(file)
--- 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
Description=Multi-User
Requires=basic.target
After=basic.target
-
+m4_dnl
m4_ifdef(`TARGET_FEDORA',
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