diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2010-09-21 21:43:40 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-09-21 21:43:40 +0200 |
| commit | 65ae3821ff45cf65e53cab82a81ea00cfec942a8 (patch) | |
| tree | 6f44eafe07e33ddb7052a5a8d91be9dacf1734e2 | |
| parent | f9ccc724990035fd9b2905857a695ade041ab133 (diff) | |
units: enable var-run + var-lock service by default
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | units/var-lock.mount | 3 | ||||
| -rw-r--r-- | units/var-lock.service | 3 | ||||
| -rw-r--r-- | units/var-run.mount | 3 | ||||
| -rw-r--r-- | units/var-run.service | 3 |
5 files changed, 7 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index d233da6ca5..f5d46904af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -905,6 +905,7 @@ install-data-hook: $(DESTDIR)$(systemunitdir)/sockets.target.wants \ $(DESTDIR)$(systemunitdir)/sysinit.target.wants \ $(DESTDIR)$(systemunitdir)/shutdown.target.wants \ + $(DESTDIR)$(systemunitdir)/local-fs.target.wants \ $(DESTDIR)$(systemunitdir)/runlevel1.target.wants \ $(DESTDIR)$(systemunitdir)/runlevel2.target.wants \ $(DESTDIR)$(systemunitdir)/runlevel3.target.wants \ @@ -946,6 +947,12 @@ install-data-hook: $(LN_S) ../systemd-update-utmp-shutdown.service && \ $(LN_S) ../hwclock-save.service && \ $(LN_S) ../systemd-random-seed-save.service ) + ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ + rm -f systemd-update-utmp-shutdown.service \ + var-run.service \ + var-lock.service && \ + $(LN_S) ../var-run.service && \ + $(LN_S) ../var-lock.service ) ( cd $(DESTDIR)$(sessionunitdir) && \ rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \ $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \ diff --git a/units/var-lock.mount b/units/var-lock.mount index 17c4f522ad..f14ea94d04 100644 --- a/units/var-lock.mount +++ b/units/var-lock.mount @@ -14,6 +14,3 @@ What=tmpfs Where=/var/lock Type=tmpfs Options=mode=775,gid=lock - -[Install] -WantedBy=local-fs.target diff --git a/units/var-lock.service b/units/var-lock.service index 9c307e109c..c2e53cdb36 100644 --- a/units/var-lock.service +++ b/units/var-lock.service @@ -16,6 +16,3 @@ Before=local-fs.target Type=oneshot RemainAfterExit=yes ExecStart=/bin/mkdir -p /var/lock/subsys - -[Install] -WantedBy=local-fs.target diff --git a/units/var-run.mount b/units/var-run.mount index 90dfe0edaa..f786289536 100644 --- a/units/var-run.mount +++ b/units/var-run.mount @@ -14,6 +14,3 @@ What=tmpfs Where=/var/run Type=tmpfs Options=mode=755 - -[Install] -WantedBy=local-fs.target diff --git a/units/var-run.service b/units/var-run.service index f493ee8ec1..2cb861efc2 100644 --- a/units/var-run.service +++ b/units/var-run.service @@ -17,6 +17,3 @@ Type=oneshot RemainAfterExit=yes ExecStart=/bin/touch /var/run/utmp ; /bin/chmod 0664 /var/run/utmp ; /bin/chown root:utmp /var/run/utmp ExecStart=/bin/mkdir /var/run/user ; /bin/chmod 0755 /var/run/user ; -/sbin/restorecon /var/run/user - -[Install] -WantedBy=local-fs.target |