diff options
Diffstat (limited to 'rc.d')
-rwxr-xr-x | rc.d/init.d/network | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 95ed7be7..169a64e2 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -60,6 +60,18 @@ rc=0 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 |