[systemd-commits] 4 commits - Makefile.am units/.gitignore units/graphical.target units/graphical.target.m4 units/http-daemon.target units/mail-transfer-agent.target units/multi-user.target units/multi-user.target.m4 units/nss-lookup.target units/remote-fs.target.m4 units/rpcbind.target units/rtc-set.target units/syslog.target units/syslog.target.in
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Mar 17 21:13:15 PDT 2011
Makefile.am | 11 ++++-------
units/.gitignore | 3 ---
units/graphical.target | 18 ++++++++++++++++++
units/graphical.target.m4 | 18 ------------------
units/http-daemon.target | 3 +++
units/mail-transfer-agent.target | 3 +++
units/multi-user.target | 18 ++++++++++++++++++
units/multi-user.target.m4 | 18 ------------------
units/nss-lookup.target | 4 +++-
units/remote-fs.target.m4 | 1 -
units/rpcbind.target | 3 +++
units/rtc-set.target | 3 +++
units/syslog.target | 14 ++++++++++++++
units/syslog.target.in | 11 -----------
14 files changed, 69 insertions(+), 59 deletions(-)
New commits:
commit d94ac66d3232054f1249821e74badeb4c99ae60e
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Mar 18 05:13:06 2011 +0100
units: don't ever pull in SysV targets from other SysV targets
diff --git a/units/nss-lookup.target b/units/nss-lookup.target
index dc3a063..bdca03c 100644
--- a/units/nss-lookup.target
+++ b/units/nss-lookup.target
@@ -12,5 +12,4 @@
[Unit]
Description=Name Lookups
-Wants=network.target
After=network.target
diff --git a/units/remote-fs.target.m4 b/units/remote-fs.target.m4
index f70fda4..53054b6 100644
--- a/units/remote-fs.target.m4
+++ b/units/remote-fs.target.m4
@@ -12,7 +12,6 @@ Description=Remote File Systems
m4_dnl
m4_ifdef(`FOR_SYSTEM',
m4_dnl When running in system mode we need the network up
-Requires=network.target
After=network.target
)m4_dnl
commit 1c7c17ea61727eb6af8159bb519beeced1c25eb4
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Mar 18 05:12:34 2011 +0100
units: document that some targets exists only for compat with SysV
diff --git a/units/http-daemon.target b/units/http-daemon.target
index bd7a1ef..45f1018 100644
--- a/units/http-daemon.target
+++ b/units/http-daemon.target
@@ -7,5 +7,8 @@
# See systemd.special(7) for details
+# This exists mostly for compatibility with SysV/LSB units, and
+# implementations lacking socket/bus activation.
+
[Unit]
Description=Web Server
diff --git a/units/mail-transfer-agent.target b/units/mail-transfer-agent.target
index 2640076..ebb1ea1 100644
--- a/units/mail-transfer-agent.target
+++ b/units/mail-transfer-agent.target
@@ -7,5 +7,8 @@
# See systemd.special(7) for details
+# This exists mostly for compatibility with SysV/LSB units, and
+# implementations lacking socket/bus activation.
+
[Unit]
Description=Mail Transfer Agent
diff --git a/units/nss-lookup.target b/units/nss-lookup.target
index 3158441..dc3a063 100644
--- a/units/nss-lookup.target
+++ b/units/nss-lookup.target
@@ -7,6 +7,9 @@
# See systemd.special(7) for details
+# This exists mostly for compatibility with SysV/LSB units, and
+# implementations lacking socket/bus activation.
+
[Unit]
Description=Name Lookups
Wants=network.target
diff --git a/units/rpcbind.target b/units/rpcbind.target
index 41eb3a5..a5cea8c 100644
--- a/units/rpcbind.target
+++ b/units/rpcbind.target
@@ -7,5 +7,8 @@
# See systemd.special(7) for details
+# This exists mostly for compatibility with SysV/LSB units, and
+# implementations lacking socket/bus activation.
+
[Unit]
Description=RPC Port Mapper
diff --git a/units/rtc-set.target b/units/rtc-set.target
index eabdaf4..df4c402 100644
--- a/units/rtc-set.target
+++ b/units/rtc-set.target
@@ -7,5 +7,8 @@
# See systemd.special(7) for details
+# This exists mostly for compatibility with SysV/LSB units, and
+# implementations lacking socket/bus activation.
+
[Unit]
Description=RTC Set
diff --git a/units/syslog.target b/units/syslog.target
index d5410cf..8b1626e 100644
--- a/units/syslog.target
+++ b/units/syslog.target
@@ -7,5 +7,8 @@
# See systemd.special(7) for details
+# This exists mostly for compatibility with SysV/LSB units, and
+# implementations lacking socket/bus activation.
+
[Unit]
Description=Syslog
commit 6699c857a20378e1fd2a33e3e306a96404e7f83d
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Mar 18 05:01:30 2011 +0100
units: we don't need to generate syslog.target with sed anymore
diff --git a/Makefile.am b/Makefile.am
index 5769dcb..371cc56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,7 +259,8 @@ dist_systemunit_DATA = \
units/systemd-tmpfiles-clean.timer \
units/quotaon.service \
units/systemd-ask-password-wall.path \
- units/systemd-ask-password-console.path
+ units/systemd-ask-password-console.path \
+ units/syslog.target
nodist_systemunit_DATA = \
units/getty at .service \
@@ -286,7 +287,6 @@ nodist_systemunit_DATA = \
units/systemd-ask-password-wall.service \
units/systemd-ask-password-console.service \
units/systemd-sysctl.service \
- units/syslog.target \
units/halt.service \
units/poweroff.service \
units/reboot.service \
@@ -330,7 +330,6 @@ EXTRA_DIST = \
units/systemd-ask-password-wall.service.in \
units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
- units/syslog.target.in \
units/halt.service.in \
units/poweroff.service.in \
units/reboot.service.in \
diff --git a/units/.gitignore b/units/.gitignore
index cb0c7d5..41ab51b 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -29,7 +29,6 @@ systemd-random-seed-load.service
systemd-random-seed-save.service
systemd-initctl.service
systemd-logger.service
-syslog.target
getty at .service
remote-fs.target
systemd-update-utmp-runlevel.service
diff --git a/units/syslog.target b/units/syslog.target
new file mode 100644
index 0000000..d5410cf
--- /dev/null
+++ b/units/syslog.target
@@ -0,0 +1,11 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=Syslog
diff --git a/units/syslog.target.in b/units/syslog.target.in
deleted file mode 100644
index d5410cf..0000000
--- a/units/syslog.target.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# See systemd.special(7) for details
-
-[Unit]
-Description=Syslog
commit db25d1d7655b1de4554942e49bc80a9b176ef8df
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Mar 18 04:59:05 2011 +0100
units: we no longer need m4 to build graphical.target or multi-user.taregt
diff --git a/Makefile.am b/Makefile.am
index 3120e78..5769dcb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -205,6 +205,8 @@ dist_tmpfiles_DATA = \
tmpfiles.d/x11.conf
dist_systemunit_DATA = \
+ units/graphical.target \
+ units/multi-user.target \
units/emergency.service \
units/emergency.target \
units/sysinit.target \
@@ -263,9 +265,7 @@ nodist_systemunit_DATA = \
units/getty at .service \
units/serial-getty at .service \
units/console-shell.service \
- units/graphical.target \
units/remote-fs.target \
- units/multi-user.target \
units/systemd-initctl.service \
units/systemd-logger.service \
units/systemd-shutdownd.service \
@@ -308,8 +308,6 @@ EXTRA_DIST = \
units/getty at .service.m4 \
units/serial-getty at .service.m4 \
units/console-shell.service.m4 \
- units/graphical.target.m4 \
- units/multi-user.target.m4 \
units/remote-fs.target.m4 \
units/rescue.service.m4 \
units/systemd-initctl.service.in \
diff --git a/units/.gitignore b/units/.gitignore
index a64cac1..cb0c7d5 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -30,8 +30,6 @@ systemd-random-seed-save.service
systemd-initctl.service
systemd-logger.service
syslog.target
-graphical.target
-multi-user.target
getty at .service
remote-fs.target
systemd-update-utmp-runlevel.service
diff --git a/units/graphical.target b/units/graphical.target
new file mode 100644
index 0000000..f2e3034
--- /dev/null
+++ b/units/graphical.target
@@ -0,0 +1,18 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=Graphical Interface
+Requires=multi-user.target
+After=multi-user.target
+Conflicts=rescue.target
+AllowIsolate=yes
+
+[Install]
+Alias=default.target
diff --git a/units/graphical.target.m4 b/units/graphical.target.m4
deleted file mode 100644
index f2e3034..0000000
--- a/units/graphical.target.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# See systemd.special(7) for details
-
-[Unit]
-Description=Graphical Interface
-Requires=multi-user.target
-After=multi-user.target
-Conflicts=rescue.target
-AllowIsolate=yes
-
-[Install]
-Alias=default.target
diff --git a/units/multi-user.target b/units/multi-user.target
new file mode 100644
index 0000000..66f1a95
--- /dev/null
+++ b/units/multi-user.target
@@ -0,0 +1,18 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=Multi-User
+Requires=basic.target
+Conflicts=rescue.service rescue.target
+After=basic.target rescue.service rescue.target
+AllowIsolate=yes
+
+[Install]
+Alias=default.target
diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
deleted file mode 100644
index 66f1a95..0000000
--- a/units/multi-user.target.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# See systemd.special(7) for details
-
-[Unit]
-Description=Multi-User
-Requires=basic.target
-Conflicts=rescue.service rescue.target
-After=basic.target rescue.service rescue.target
-AllowIsolate=yes
-
-[Install]
-Alias=default.target
More information about the systemd-commits
mailing list