From fb1bd35a5dd1ad5cfd848fdbe0d64ac53a122af0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 17 May 2010 02:17:22 +0200 Subject: unit: properly generate session units --- Makefile.am | 31 +++++++++++++++++++++++-------- units/.gitignore | 1 + units/remote-fs.target | 23 ----------------------- units/remote-fs.target.m4 | 27 +++++++++++++++++++++++++++ units/session/Makefile | 1 + 5 files changed, 52 insertions(+), 31 deletions(-) delete mode 100644 units/remote-fs.target create mode 100644 units/remote-fs.target.m4 create mode 120000 units/session/Makefile diff --git a/Makefile.am b/Makefile.am index 683a00bc0c..3b54699afd 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@.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@.service: units/getty@.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 21b3b384c7..7e61543864 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -5,3 +5,4 @@ basic.target graphical.target multi-user.target getty@.service +remote-fs.target diff --git a/units/remote-fs.target b/units/remote-fs.target deleted file mode 100644 index 177a773c90..0000000000 --- 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 . - -# 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 0000000000..0891d0b025 --- /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 . + +# 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 0000000000..50be21181f --- /dev/null +++ b/units/session/Makefile @@ -0,0 +1 @@ +../../src/Makefile \ No newline at end of file -- cgit v1.2.3-54-g00ecf