Signed-off-by: Juergen Borleis <[email protected]>
---
rules/fake-overlayfs.in | 4 ----
rules/initmethod-bbinit.in | 1 -
rules/rootfs.in | 12 ++----------
rules/rootfs.make | 2 --
4 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/rules/fake-overlayfs.in b/rules/fake-overlayfs.in
index c328bc0fb..2469ddfad 100644
--- a/rules/fake-overlayfs.in
+++ b/rules/fake-overlayfs.in
@@ -18,23 +18,19 @@ comment "Copy the content of these directories"
config FAKE_OVERLAYFS_VAR
bool "/var"
- select ROOTFS_VAR if ROOTFS
if !FAKE_OVERLAYFS_VAR
config FAKE_OVERLAYFS_VAR_LIB
bool "/var/lib"
- select ROOTFS_VAR if ROOTFS
select ROOTFS_VAR_LIB if ROOTFS
config FAKE_OVERLAYFS_VAR_TMP
bool "/var/tmp"
- select ROOTFS_VAR if ROOTFS
select ROOTFS_VAR_TMP if ROOTFS
config FAKE_OVERLAYFS_VAR_CACHE
bool "/var/cache"
- select ROOTFS_VAR if ROOTFS
select ROOTFS_VAR_CACHE if ROOTFS
endif
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in
index 383add59f..e0b3be178 100644
--- a/rules/initmethod-bbinit.in
+++ b/rules/initmethod-bbinit.in
@@ -33,7 +33,6 @@ config INITMETHOD_BBINIT_ETC_INITD_NETWORKING
config INITMETHOD_BBINIT_ETC_INITD_RT_SET_BANDWIDTH
bool
prompt "install /etc/init.d/rt-set-bandwidth"
- select ROOTFS_VAR
select ROOTFS_VAR_RUN
default y
help
diff --git a/rules/rootfs.in b/rules/rootfs.in
index d844f825e..3ea4bde60 100644
--- a/rules/rootfs.in
+++ b/rules/rootfs.in
@@ -169,15 +169,7 @@ config ROOTFS_TMP
Create a /tmp directory in the root filesystem.
You should say yes here.
-config ROOTFS_VAR
- bool
- prompt "/var"
- default y
- help
- Create a /var directory in the root filesystem.
- You should say yes here.
-
-if ROOTFS_VAR
+menu "/var "
config ROOTFS_VAR_OVERLAYFS
bool
@@ -256,7 +248,7 @@ config ROOTFS_VAR_TMP
system reboots. Say 'y' here to ensure a '/var/tmp' directory is
available at run-time.
-endif # ROOTFS_VAR
+endmenu
endif # ROOTFS
# ----------------------------------------------------------------------------
diff --git a/rules/rootfs.make b/rules/rootfs.make
index 8f0c61f52..8183d0288 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -96,9 +96,7 @@ endif
ifdef PTXCONF_ROOTFS_TMP
@$(call install_copy, rootfs, 0, 0, 1777, /tmp)
endif
-ifdef PTXCONF_ROOTFS_VAR
@$(call install_copy, rootfs, 0, 0, 0755, /var)
-endif
ifdef PTXCONF_ROOTFS_VAR_LOG
@$(call install_copy, rootfs, 0, 0, 0755, /var/log)
endif
--
2.20.1
_______________________________________________
ptxdist mailing list
[email protected]
