diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-01-11 15:04:41 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:21:57 +0200 |
commit | a1e2a7c07c8f79fed3a3c047f62b944f413a82cf (patch) | |
tree | 9f756a51f165aea09c9cb18ee9525af19a1b8b5e | |
parent | 308f31e5ee1436402aec35c8843d7bcff84eef14 (diff) | |
download | ptxdist-a1e2a7c07c8f79fed3a3c047f62b944f413a82cf.tar.gz ptxdist-a1e2a7c07c8f79fed3a3c047f62b944f413a82cf.tar.xz |
initmethod-systemd: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rwxr-xr-x | projectroot/usr/lib/systemd/ifupdown-prepare (renamed from projectroot/lib/systemd/ifupdown-prepare) | 0 | ||||
-rw-r--r-- | projectroot/usr/lib/systemd/system/ifupdown-prepare.service (renamed from projectroot/lib/systemd/system/ifupdown-prepare.service) | 2 | ||||
-rw-r--r-- | projectroot/usr/lib/systemd/system/ifupdown.service (renamed from projectroot/lib/systemd/system/ifupdown.service) | 0 | ||||
-rw-r--r-- | rules/initmethod-systemd.make | 12 |
4 files changed, 7 insertions, 7 deletions
diff --git a/projectroot/lib/systemd/ifupdown-prepare b/projectroot/usr/lib/systemd/ifupdown-prepare index 2028749fb..2028749fb 100755 --- a/projectroot/lib/systemd/ifupdown-prepare +++ b/projectroot/usr/lib/systemd/ifupdown-prepare diff --git a/projectroot/lib/systemd/system/ifupdown-prepare.service b/projectroot/usr/lib/systemd/system/ifupdown-prepare.service index 2c2c43b8f..dbd86ba19 100644 --- a/projectroot/lib/systemd/system/ifupdown-prepare.service +++ b/projectroot/usr/lib/systemd/system/ifupdown-prepare.service @@ -7,5 +7,5 @@ ConditionPathExists=!/var/run/ifstate [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/lib/systemd/ifupdown-prepare +ExecStart=/usr/lib/systemd/ifupdown-prepare diff --git a/projectroot/lib/systemd/system/ifupdown.service b/projectroot/usr/lib/systemd/system/ifupdown.service index f9dd5b473..f9dd5b473 100644 --- a/projectroot/lib/systemd/system/ifupdown.service +++ b/projectroot/usr/lib/systemd/system/ifupdown.service diff --git a/rules/initmethod-systemd.make b/rules/initmethod-systemd.make index 3738076e6..4fea694dd 100644 --- a/rules/initmethod-systemd.make +++ b/rules/initmethod-systemd.make @@ -33,19 +33,19 @@ $(STATEDIR)/initmethod-systemd.targetinstall: ifdef PTXCONF_INITMETHOD_SYSTEMD_IFUPDOWN @$(call install_alternative, initmethod-systemd, 0, 0, 0755, \ - /lib/systemd/ifupdown-prepare) + /usr/lib/systemd/ifupdown-prepare) @$(call install_alternative, initmethod-systemd, 0, 0, 0644, \ - /lib/systemd/system/ifupdown-prepare.service) + /usr/lib/systemd/system/ifupdown-prepare.service) @$(call install_link, initmethod-systemd, ../ifupdown-prepare.service, \ - /lib/systemd/system/ifupdown.service.wants/ifupdown-prepare.service) + /usr/lib/systemd/system/ifupdown.service.wants/ifupdown-prepare.service) @$(call install_alternative, initmethod-systemd, 0, 0, 0644, \ - /lib/systemd/system/ifupdown.service) + /usr/lib/systemd/system/ifupdown.service) @$(call install_link, initmethod-systemd, ../ifupdown.service, \ - /lib/systemd/system/network.target.wants/ifupdown.service) + /usr/lib/systemd/system/network.target.wants/ifupdown.service) @$(call install_link, initmethod-systemd, ../network.target, \ - /lib/systemd/system/multi-user.target.wants/network.target) + /usr/lib/systemd/system/multi-user.target.wants/network.target) @$(call install_alternative, initmethod-systemd, 0, 0, 0644, /etc/network/interfaces) @$(call install_copy, initmethod-systemd, 0, 0, 0755, /etc/network/if-down.d) |