diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-05-17 02:17:22 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-05-17 02:17:22 +0200 |
| commit | fb1bd35a5dd1ad5cfd848fdbe0d64ac53a122af0 (patch) | |
| tree | eaa94954403cb286342ebadabc4568314ca5c6ef | |
| parent | 340d89e06e503836de9c124d650845f4889f8c2c (diff) | |
unit: properly generate session units
| -rw-r--r-- | Makefile.am | 31 | ||||
| -rw-r--r-- | units/.gitignore | 1 | ||||
| -rw-r--r-- | units/remote-fs.target.m4 (renamed from units/remote-fs.target) | 4 | ||||
| l--------- | units/session/Makefile | 1 |
4 files changed, 29 insertions, 8 deletions
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.m4 index 177a773c90..0891d0b025 100644 --- a/units/remote-fs.target +++ b/units/remote-fs.target.m4 @@ -19,5 +19,9 @@ [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 |