diff options
| author |   Lennart Poettering <lennart@poettering.net> | 2011-04-06 15:57:37 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-04-06 15:57:37 +0200 |
| commit | f80781eaf9f927d7b4d5e66116e3f3a4242e6fa1 (patch) | |
| tree | 0e8fbc5d09df17bdc43b0b22fd6061850e19e654 | |
| parent | update TODO (diff) | |
| download | systemd-f80781eaf9f927d7b4d5e66116e3f3a4242e6fa1.tar.gz systemd-f80781eaf9f927d7b4d5e66116e3f3a4242e6fa1.tar.bz2 systemd-f80781eaf9f927d7b4d5e66116e3f3a4242e6fa1.zip | |
var-lock: don't try to enable var-lock.mount if we don't install it
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | TODO | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 4e244807c..160acfb9c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -274,7 +274,6 @@ dist_systemunit_DATA += \ units/var-lock.mount endif - nodist_systemunit_DATA = \ units/getty@.service \ units/serial-getty@.service \ @@ -1320,13 +1319,11 @@ install-data-hook: fsck-root.service \ remount-rootfs.service \ var-run.mount \ - var-lock.mount \ media.mount && \ $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \ $(LN_S) ../fsck-root.service fsck-root.service && \ $(LN_S) ../remount-rootfs.service remount-rootfs.service && \ $(LN_S) ../var-run.mount var-run.mount && \ - $(LN_S) ../var-lock.mount var-lock.mount && \ $(LN_S) ../media.mount media.mount ) ( cd $(DESTDIR)$(userunitdir) && \ rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \ @@ -1474,6 +1471,12 @@ if TARGET_DEBIAN_OR_UBUNTU $(LN_S) multi-user.target runlevel5.target ) endif +if HAVE_SYSV_COMPAT + ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ + rm -f var-lock.mount && \ + $(LN_S) ../var-lock.mount var-lock.mount ) +endif + DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \ @@ -3,9 +3,15 @@ F15: * swap units that are activated by one name but shown in the kernel under another are semi-broken * isolate multi-user.target doesn't start a getty@tty1 if we run it from graphical.target + https://bugzilla.redhat.com/show_bug.cgi?id=688661 * NFS, networkmanager ordering issue (PENDING) +* NM should pull in network.target (PENDING) + https://bugzilla.redhat.com/show_bug.cgi?id=692008 + +* ntpd should pull in rtc-set.target. (PENDING) + * add fstab fields to add wait timeouts, change Wants to Requires by local-fs.target * hook emergency.target into local-fs.target in some way as OnFailure with isolate @@ -15,8 +21,6 @@ F15: * 0595f9a1c182a84581749823ef47c5f292e545f9 is borked, freezes shutdown (path: after installing inotify watches, recheck file again to fix race) -* NM should pull in network.target, ntpd should pull in rtc-set.target. - * bluetooth should be possible to disable * fix alsa mixer restore to not print error when no config is stored |