summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-07-22 19:14:18 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-07-23 09:26:10 +0200
commit46622acacdf91f2c16b2e85d376de97ddd45e500 (patch)
tree3e637b83c44918defc2ad1256b027832254c7255
parent8f1263a5aa553d118202885e3b073e1accd39943 (diff)
downloadptxdist-46622acacdf91f2c16b2e85d376de97ddd45e500.tar.gz
make /var/run a symlink to /run
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--projectroot/etc/fstab1
-rw-r--r--rules/fake-overlayfs.in5
-rw-r--r--rules/rootfs.in3
-rw-r--r--rules/rootfs.make2
-rw-r--r--rules/udisks.in1
-rw-r--r--rules/udisks.make2
6 files changed, 3 insertions, 11 deletions
diff --git a/projectroot/etc/fstab b/projectroot/etc/fstab
index 89ce094..0121c30 100644
--- a/projectroot/etc/fstab
+++ b/projectroot/etc/fstab
@@ -11,7 +11,6 @@ debugfs /sys/kernel/debug debugfs noauto 0 0
# ramdisks
tmpfs /tmp tmpfs nosuid,nodev,mode=1777,size=20% 0 0
tmpfs /run tmpfs nosuid,nodev,strictatime,mode=0755 0 0
-/run /var/run bind bind 0 0
tmpfs /var/log tmpfs nosuid,nodev,noexec,mode=0755,size=10% 0 0
tmpfs /var/lock tmpfs nosuid,nodev,noexec,mode=0755,size=1M 0 0
tmpfs /var/tmp tmpfs nosuid,nodev,mode=1777,size=20% 0 0
diff --git a/rules/fake-overlayfs.in b/rules/fake-overlayfs.in
index ebc4b10..c328bc0 100644
--- a/rules/fake-overlayfs.in
+++ b/rules/fake-overlayfs.in
@@ -22,11 +22,6 @@ config FAKE_OVERLAYFS_VAR
if !FAKE_OVERLAYFS_VAR
-config FAKE_OVERLAYFS_VAR_RUN
- bool "/var/run"
- select ROOTFS_VAR if ROOTFS
- select ROOTFS_VAR_RUN if ROOTFS
-
config FAKE_OVERLAYFS_VAR_LIB
bool "/var/lib"
select ROOTFS_VAR if ROOTFS
diff --git a/rules/rootfs.in b/rules/rootfs.in
index ef7f003..5965417 100644
--- a/rules/rootfs.in
+++ b/rules/rootfs.in
@@ -182,10 +182,11 @@ if ROOTFS_VAR
config ROOTFS_VAR_RUN
bool
+ select ROOTFS_RUN
prompt "/var/run"
default y
help
- Create a /var/run directory in the root filesystem.
+ This will not create a directory but a symlink to /run.
Unless you want to mount a tmpfs on /var you should
say yes here.
diff --git a/rules/rootfs.make b/rules/rootfs.make
index 7879093..08ae3a8 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -103,7 +103,7 @@ ifdef PTXCONF_ROOTFS_VAR_LOG
@$(call install_copy, rootfs, 0, 0, 0755, /var/log)
endif
ifdef PTXCONF_ROOTFS_VAR_RUN
- @$(call install_copy, rootfs, 0, 0, 0755, /var/run)
+ @$(call install_link, rootfs, ../run, /var/run)
endif
ifdef PTXCONF_ROOTFS_VAR_LOCK
@$(call install_copy, rootfs, 0, 0, 0755, /var/lock)
diff --git a/rules/udisks.in b/rules/udisks.in
index 52ac675..e69c84e 100644
--- a/rules/udisks.in
+++ b/rules/udisks.in
@@ -25,7 +25,6 @@ menuconfig UDISKS
select UTIL_LINUX_NG_UMOUNT
select FAKE_OVERLAYFS if UDISKS_FAKE_OVERLAYFS
select FAKE_OVERLAYFS_VAR_TMP if UDISKS_FAKE_OVERLAYFS && !FAKE_OVERLAYFS_VAR
- select FAKE_OVERLAYFS_VAR_RUN if UDISKS_FAKE_OVERLAYFS && !FAKE_OVERLAYFS_VAR
prompt "udisks "
help
abstraction for enumerating block devices
diff --git a/rules/udisks.make b/rules/udisks.make
index 2afa67f..173c560 100644
--- a/rules/udisks.make
+++ b/rules/udisks.make
@@ -111,8 +111,6 @@ else
@$(call install_copy, udisks, 0, 0, 0755, \
/var/lib/udisks)
endif
- @$(call install_copy, udisks, 0, 0, 0755, \
- /var/run/udisks)
@$(call install_finish, udisks)