[systemd-commits] 2 commits - Makefile.am units/basic.target.m4 units/fedora units/getty at .service.m4 units/.gitignore units/graphical.target.m4 units/multi-user.target.m4 units/remote-fs.target units/remote-fs.target.m4 units/session
Lennart Poettering
lennart at kemper.freedesktop.org
Sun May 16 17:17:54 PDT 2010
Makefile.am | 31 +++++++++++++++++++++++--------
units/.gitignore | 1 +
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 at .service.m4 | 7 +++----
units/graphical.target.m4 | 7 ++++---
units/multi-user.target.m4 | 7 ++++---
units/remote-fs.target | 23 -----------------------
units/remote-fs.target.m4 | 27 +++++++++++++++++++++++++++
units/session/Makefile | 1 +
16 files changed, 67 insertions(+), 58 deletions(-)
New commits:
commit e6aad08ba82e44e88f9186eab30c68ceaf6370a3
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon May 17 02:17:47 2010 +0200
units: fix commenting
diff --git a/units/basic.target.m4 b/units/basic.target.m4
index 437e33d..c31a8f6 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 372b7e6..acc47b5 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 <http://www.gnu.org/licenses/>.
-# 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 1a6d47f..45868dd 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 <http://www.gnu.org/licenses/>.
-# See systemd.special(7) for details
-
[Unit]
Description=Kill All Processes
diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
index 82b9fac..758b7ca 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 <http://www.gnu.org/licenses/>.
-# 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 6ee3503..7df09ac 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 <http://www.gnu.org/licenses/>.
-# 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 b3ece1e..099bbab 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 <http://www.gnu.org/licenses/>.
-# 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 45a2934..9aec7aa 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 <http://www.gnu.org/licenses/>.
-# 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 fc71453..0d59490 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 <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
diff --git a/units/getty at .service.m4 b/units/getty at .service.m4
index b4dfaf2..b951248 100644
--- a/units/getty at .service.m4
+++ b/units/getty at .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/>.
-# 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 151ad6b..cb8e811 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 a841f9a..b7f5f15 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
commit fb1bd35a5dd1ad5cfd848fdbe0d64ac53a122af0
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon May 17 02:17:22 2010 +0200
unit: properly generate session units
diff --git a/Makefile.am b/Makefile.am
index 683a00b..3b54699 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,6 +93,9 @@ systemunit_DATA = \
units/systemd-logger.service \
units/syslog.target
+sessionunit_DATA = \
+ units/session/remote-fs.target
+
EXTRA_DIST = \
units/basic.target.m4 \
units/getty at .service.m4 \
@@ -322,21 +325,31 @@ if TARGET_FEDORA
M4_FLAGS += -DTARGET_FEDORA=1
endif
-M4_PROCESS = \
+M4_PROCESS_SYSTEM = \
$(MKDIR_P) units && \
- $(M4) -P $(M4_FLAGS) < $< > $@
+ $(M4) -P $(M4_FLAGS) -DFOR_SYSTEM < $< > $@
+
+M4_PROCESS_SESSION = \
+ $(MKDIR_P) units/session && \
+ $(M4) -P $(M4_FLAGS) -DFOR_SESSION < $< > $@
units/basic.target: units/basic.target.m4 Makefile
- $(M4_PROCESS)
+ $(M4_PROCESS_SYSTEM)
units/graphical.target: units/graphical.target.m4 Makefile
- $(M4_PROCESS)
+ $(M4_PROCESS_SYSTEM)
units/multi-user.target: units/multi-user.target.m4 Makefile
- $(M4_PROCESS)
+ $(M4_PROCESS_SYSTEM)
units/getty at .service: units/getty at .service.m4 Makefile
- $(M4_PROCESS)
+ $(M4_PROCESS_SYSTEM)
+
+units/remote-fs.target: units/remote-fs.target.m4 Makefile
+ $(M4_PROCESS_SYSTEM)
+
+units/session/remote-fs.target: units/remote-fs.target.m4 Makefile
+ $(M4_PROCESS_SESSION)
CLEANFILES = \
src/systemd-interfaces.c \
@@ -384,9 +397,11 @@ install-data-hook:
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
( cd $(DESTDIR)$(sessionunitdir) && \
- rm -f shutdown.target sockets.target && \
+ rm -f shutdown.target sockets.target local-fs.target swap.target && \
$(LN_S) ../system/shutdown.target shutdown.target && \
- $(LN_S) ../system/sockets.target sockets.target )
+ $(LN_S) ../system/sockets.target sockets.target && \
+ $(LN_S) ../system/local-fs.target local-fs.target && \
+ $(LN_S) ../system/swap.target swap.target )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel0.target runlevel1.target runlevel6.target && \
$(LN_S) poweroff.target runlevel0.target && \
diff --git a/units/.gitignore b/units/.gitignore
index 21b3b38..7e61543 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -5,3 +5,4 @@ basic.target
graphical.target
multi-user.target
getty at .service
+remote-fs.target
diff --git a/units/remote-fs.target b/units/remote-fs.target
deleted file mode 100644
index 177a773..0000000
--- a/units/remote-fs.target
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file is part of systemd.
-#
-# Copyright 2010 Lennart Poettering
-#
-# 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.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# 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=Remote File Systems
-Requires=network.target
-After=network.target
diff --git a/units/remote-fs.target.m4 b/units/remote-fs.target.m4
new file mode 100644
index 0000000..0891d0b
--- /dev/null
+++ b/units/remote-fs.target.m4
@@ -0,0 +1,27 @@
+# This file is part of systemd.
+#
+# Copyright 2010 Lennart Poettering
+#
+# 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.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# 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=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
diff --git a/units/session/Makefile b/units/session/Makefile
new file mode 120000
index 0000000..50be211
--- /dev/null
+++ b/units/session/Makefile
@@ -0,0 +1 @@
+../../src/Makefile
\ No newline at end of file
More information about the systemd-commits
mailing list