diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | rc.d/init.d/network | 11 | ||||
| -rw-r--r-- | systemd/system/mandriva-clean-var-run-lock.service | 19 |
3 files changed, 0 insertions, 31 deletions
@@ -141,7 +141,6 @@ install: ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/lib/systemd/system/sysinit.target.wants - ln -s ../mandriva-clean-var-run-lock.service $(ROOT)/lib/systemd/system/sysinit.target.wants ln -s ../mandriva-boot-links.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../mandriva-save-dmesg.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../mandriva-everytime.service $(ROOT)/lib/systemd/system/basic.target.wants diff --git a/rc.d/init.d/network b/rc.d/init.d/network index e9d22dd7..fbe67dd9 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -62,17 +62,6 @@ case "$1" in start) [ "$EUID" != "0" ] && exit 4 - # (cg) Note that using /var/lock/subsys/network as an indicator is not - # enough to prevent the udev net_action script kicking in on boot as - # /var/lock may be messy from the previous boot. - # The systemd service mandriva-clean-var-run-lock.service should tidy - # it up but it cannot run until after udev has started due to it being - # needed to mount /var filesystems. - # We can remove the hack below once /var/lock is a symlink to /run/lock - # which is on tmpfs and thus requires no cleaning. - # Please also see the corresponding code/comment in /lib/udev/net_action - touch /run/.mageia-network 2>/dev/null - rc=0 # IPv6 hook (pre IPv4 start) if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then diff --git a/systemd/system/mandriva-clean-var-run-lock.service b/systemd/system/mandriva-clean-var-run-lock.service deleted file mode 100644 index 1fa808ce..00000000 --- a/systemd/system/mandriva-clean-var-run-lock.service +++ /dev/null @@ -1,19 +0,0 @@ -# This file is part of initscripts. -# -# Implement /var/run and /var/lock clean up that is part of standard -# rc.sysinit but cannot be expressed using tmpfiles.d - -[Unit] -Description=Cleanup of /var/run and /var/lock -DefaultDependencies=no -Wants=local-fs.target -After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target -Before=systemd-tmpfiles-setup.service sysinit.target shutdown.target -ConditionPathExists=!/run/.suppress-mandriva-var-clean - -[Service] -Type=oneshot -ExecStart=-/usr/bin/find /var/lock /var/run -depth ! -type d ! -path /var/lock/TMP_1ST -delete -ExecStartPost=-/bin/touch /run/.suppress-mandriva-var-clean -IOSchedulingClass=idle -RemainAfterExit=yes |