From e0bcee0206fd3052fd2cf45c587957e6143fd1c7 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Mon, 20 Apr 2015 09:47:19 -0400
Subject: [PATCH] init-ifupdown: Attempt to make our init script available for
 everyone

Create the /run/network directory for all of our systems. The
proper way with tmpfiles.d ends with a depedency mess that has
no point in being debugged.

My local build hasn't completed yet but we need to rush. Let the
CI test this change and we will see.

Related: SYS#1514
---
 .../init-ifupdown/{sysmocom-idu => }/init     |  0
 .../init-ifupdown/sysmocom-odu/init           | 91 -------------------
 2 files changed, 91 deletions(-)
 rename recipes-bsp/init-ifupdown/init-ifupdown/{sysmocom-idu => }/init (100%)
 delete mode 100644 recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/init

diff --git a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/init b/recipes-bsp/init-ifupdown/init-ifupdown/init
similarity index 100%
rename from recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/init
rename to recipes-bsp/init-ifupdown/init-ifupdown/init
diff --git a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/init b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/init
deleted file mode 100644
index 986a2eb..0000000
--- a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/init
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh -e
-### BEGIN INIT INFO
-# Provides:          networking
-# Required-Start:    mountvirtfs $local_fs
-# Required-Stop:     $local_fs
-# Should-Start:      ifupdown
-# Should-Stop:       ifupdown
-# Default-Start:     S
-# Default-Stop:      0 6
-# Short-Description: Raise network interfaces.
-### END INIT INFO
-
-PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
-
-[ -x /sbin/ifup ] || exit 0
-
-check_network_file_systems() {
-    [ -e /proc/mounts ] || return 0
-
-    if [ -e /etc/iscsi/iscsi.initramfs ]; then
-	echo "not deconfiguring network interfaces: iSCSI root is mounted."
-	exit 0
-    fi
-
-    exec 9<&0 < /proc/mounts
-    while read DEV MTPT FSTYPE REST; do
-	case $DEV in
-	/dev/nbd*|/dev/nd[a-z]*|/dev/etherd/e*)
-	    echo "not deconfiguring network interfaces: network devices still mounted."
-	    exit 0
-	    ;;
-	esac
-	case $FSTYPE in
-	nfs|nfs4|smbfs|ncp|ncpfs|cifs|coda|ocfs2|gfs|pvfs|pvfs2|fuse.httpfs|fuse.curlftpfs)
-	    echo "not deconfiguring network interfaces: network file systems still mounted."
-	    exit 0
-	    ;;
-	esac
-    done
-    exec 0<&9 9<&-
-}
-
-check_network_swap() {
-    [ -e /proc/swaps ] || return 0
-
-    exec 9<&0 < /proc/swaps
-    while read DEV MTPT FSTYPE REST; do
-	case $DEV in
-	/dev/nbd*|/dev/nd[a-z]*|/dev/etherd/e*)
-	    echo "not deconfiguring network interfaces: network swap still mounted."
-	    exit 0
-	    ;;
-	esac
-    done
-    exec 0<&9 9<&-
-}
-
-case "$1" in
-start)
-	echo -n "Configuring network interfaces... "
-	mkdir /run/network || true
-	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
-	ifup -a
-	echo "done."
-	;;
-
-stop)
-	check_network_file_systems
-	check_network_swap
-
-	echo -n "Deconfiguring network interfaces... "
-	ifdown -a
-	echo "done."
-	;;
-
-force-reload|restart)
-	echo "Running $0 $1 is deprecated because it may not enable again some interfaces"
-	echo "Reconfiguring network interfaces... "
-	ifdown -a || true
-	ifup -a
-	echo "done."
-	;;
-
-*)
-	echo "Usage: /etc/init.d/networking {start|stop}"
-	exit 1
-	;;
-esac
-
-exit 0
-