From a1e2a7c07c8f79fed3a3c047f62b944f413a82cf Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 11 Jan 2017 15:04:41 +0100 Subject: initmethod-systemd: /usr merge Signed-off-by: Michael Olbrich --- projectroot/lib/systemd/ifupdown-prepare | 7 ------- projectroot/lib/systemd/system/ifupdown-prepare.service | 11 ----------- projectroot/lib/systemd/system/ifupdown.service | 10 ---------- projectroot/usr/lib/systemd/ifupdown-prepare | 7 +++++++ projectroot/usr/lib/systemd/system/ifupdown-prepare.service | 11 +++++++++++ projectroot/usr/lib/systemd/system/ifupdown.service | 10 ++++++++++ 6 files changed, 28 insertions(+), 28 deletions(-) delete mode 100755 projectroot/lib/systemd/ifupdown-prepare delete mode 100644 projectroot/lib/systemd/system/ifupdown-prepare.service delete mode 100644 projectroot/lib/systemd/system/ifupdown.service create mode 100755 projectroot/usr/lib/systemd/ifupdown-prepare create mode 100644 projectroot/usr/lib/systemd/system/ifupdown-prepare.service create mode 100644 projectroot/usr/lib/systemd/system/ifupdown.service (limited to 'projectroot') diff --git a/projectroot/lib/systemd/ifupdown-prepare b/projectroot/lib/systemd/ifupdown-prepare deleted file mode 100755 index 2028749fb..000000000 --- a/projectroot/lib/systemd/ifupdown-prepare +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ ! -e /run/resolv.conf -a -e /proc/net/pnp ]; then - cp /proc/net/pnp /run/resolv.conf -fi - -ifconfig | awk '/^[^ ]/ { printf "%s=kernel\n", $1 }' > /var/run/ifstate diff --git a/projectroot/lib/systemd/system/ifupdown-prepare.service b/projectroot/lib/systemd/system/ifupdown-prepare.service deleted file mode 100644 index 2c2c43b8f..000000000 --- a/projectroot/lib/systemd/system/ifupdown-prepare.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Mark kernel activated network interfaces as up -Before=ifupdown.service -ConditionPathExists=!/var/run/ifstate -#ConditionKernelCommandLine=nfsroot - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/lib/systemd/ifupdown-prepare - diff --git a/projectroot/lib/systemd/system/ifupdown.service b/projectroot/lib/systemd/system/ifupdown.service deleted file mode 100644 index f9dd5b473..000000000 --- a/projectroot/lib/systemd/system/ifupdown.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Handle network interface with ifup/ifdown -Before=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/sbin/ifup -a -ExecStop=/sbin/ifdown -a - diff --git a/projectroot/usr/lib/systemd/ifupdown-prepare b/projectroot/usr/lib/systemd/ifupdown-prepare new file mode 100755 index 000000000..2028749fb --- /dev/null +++ b/projectroot/usr/lib/systemd/ifupdown-prepare @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ ! -e /run/resolv.conf -a -e /proc/net/pnp ]; then + cp /proc/net/pnp /run/resolv.conf +fi + +ifconfig | awk '/^[^ ]/ { printf "%s=kernel\n", $1 }' > /var/run/ifstate diff --git a/projectroot/usr/lib/systemd/system/ifupdown-prepare.service b/projectroot/usr/lib/systemd/system/ifupdown-prepare.service new file mode 100644 index 000000000..dbd86ba19 --- /dev/null +++ b/projectroot/usr/lib/systemd/system/ifupdown-prepare.service @@ -0,0 +1,11 @@ +[Unit] +Description=Mark kernel activated network interfaces as up +Before=ifupdown.service +ConditionPathExists=!/var/run/ifstate +#ConditionKernelCommandLine=nfsroot + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/ifupdown-prepare + diff --git a/projectroot/usr/lib/systemd/system/ifupdown.service b/projectroot/usr/lib/systemd/system/ifupdown.service new file mode 100644 index 000000000..f9dd5b473 --- /dev/null +++ b/projectroot/usr/lib/systemd/system/ifupdown.service @@ -0,0 +1,10 @@ +[Unit] +Description=Handle network interface with ifup/ifdown +Before=network.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/sbin/ifup -a +ExecStop=/sbin/ifdown -a + -- cgit v1.2.3