diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-01-11 10:25:34 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:19:40 +0200 |
| commit | 4bc52d110011f72ae23d6ac86dfc23c52aaaabe5 (patch) | |
| tree | 4552791051a30ef7a05d2071c615f4043e0251df | |
| parent | 1e4596d52b81c482a5d2320b776f68ef8e98053e (diff) | |
| download | ptxdist-4bc52d110011f72ae23d6ac86dfc23c52aaaabe5.tar.gz ptxdist-4bc52d110011f72ae23d6ac86dfc23c52aaaabe5.tar.xz | |
fake-overlayfs: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | projectroot/etc/init.d/fake-overlayfs | 2 | ||||
| -rw-r--r-- | projectroot/usr/lib/systemd/system/fake-overlayfs.service (renamed from projectroot/lib/systemd/system/fake-overlayfs.service) | 2 | ||||
| -rw-r--r-- | projectroot/usr/sbin/fake-overlayfs (renamed from projectroot/sbin/fake-overlayfs) | 0 | ||||
| -rw-r--r-- | rules/fake-overlayfs.make | 8 |
4 files changed, 6 insertions, 6 deletions
diff --git a/projectroot/etc/init.d/fake-overlayfs b/projectroot/etc/init.d/fake-overlayfs index 3785103ce..02b5237b1 100644 --- a/projectroot/etc/init.d/fake-overlayfs +++ b/projectroot/etc/init.d/fake-overlayfs @@ -8,7 +8,7 @@ case $1 in start) echo "${PREFIX}copying files to tmpfs..." - /sbin/fake-overlayfs + /usr/sbin/fake-overlayfs ;; stop) ;; diff --git a/projectroot/lib/systemd/system/fake-overlayfs.service b/projectroot/usr/lib/systemd/system/fake-overlayfs.service index efb4470e3..daa6fd03f 100644 --- a/projectroot/lib/systemd/system/fake-overlayfs.service +++ b/projectroot/usr/lib/systemd/system/fake-overlayfs.service @@ -7,5 +7,5 @@ Requires=local-fs.target [Service] Type=oneshot RemainAfterExit=no -ExecStart=/sbin/fake-overlayfs +ExecStart=/usr/sbin/fake-overlayfs MountFlags=private diff --git a/projectroot/sbin/fake-overlayfs b/projectroot/usr/sbin/fake-overlayfs index b6692c578..b6692c578 100644 --- a/projectroot/sbin/fake-overlayfs +++ b/projectroot/usr/sbin/fake-overlayfs diff --git a/rules/fake-overlayfs.make b/rules/fake-overlayfs.make index 04dd957ff..27e7b8b33 100644 --- a/rules/fake-overlayfs.make +++ b/rules/fake-overlayfs.make @@ -49,8 +49,8 @@ $(STATEDIR)/fake-overlayfs.targetinstall: @$(call install_fixup, fake-overlayfs,DESCRIPTION,missing) @$(call install_alternative, fake-overlayfs, 0, 0, 0755, \ - /sbin/fake-overlayfs) - @$(call install_replace, fake-overlayfs, /sbin/fake-overlayfs, \ + /usr/sbin/fake-overlayfs) + @$(call install_replace, fake-overlayfs, /usr/sbin/fake-overlayfs, \ @OVERLAY_DIRLIST@, $(FAKE_OVERLAYFS_DIRS)) ifdef PTXCONF_INITMETHOD_BBINIT @@ -65,9 +65,9 @@ endif endif ifdef PTXCONF_FAKE_OVERLAYFS_SYSTEMD @$(call install_alternative, fake-overlayfs, 0, 0, 0644, \ - /lib/systemd/system/fake-overlayfs.service) + /usr/lib/systemd/system/fake-overlayfs.service) @$(call install_link, fake-overlayfs, ../fake-overlayfs.service, \ - /lib/systemd/system/sysinit.target.wants/fake-overlayfs.service) + /usr/lib/systemd/system/sysinit.target.wants/fake-overlayfs.service) endif @$(call install_finish, fake-overlayfs) |