diff mbox series

[3/3] portable: tweak some default values

Message ID 20220221043034.2736010-4-francois.perrad@gadz.org
State Rejected
Headers show
Series portable services: another use case of BR | expand

Commit Message

Francois Perrad Feb. 21, 2022, 4:30 a.m. UTC 
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 fs/squashfs/Config.in              | 1 +
 package/ifupdown-scripts/Config.in | 2 +-
 system/Config.in                   | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in
index 70d4a20cf..ad27470aa 100644
--- a/fs/squashfs/Config.in
+++ b/fs/squashfs/Config.in
@@ -1,5 +1,6 @@ 
 config BR2_TARGET_ROOTFS_SQUASHFS
 	bool "squashfs root filesystem"
+	default y if BR2_INIT_PORTABLE
 	help
 	  Build a squashfs root filesystem
 
diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
index 166094c51..1607fa696 100644
--- a/package/ifupdown-scripts/Config.in
+++ b/package/ifupdown-scripts/Config.in
@@ -1,6 +1,6 @@ 
 config BR2_PACKAGE_IFUPDOWN_SCRIPTS
 	bool "ifupdown scripts"
-	default y if BR2_ROOTFS_SKELETON_DEFAULT
+	default y if BR2_ROOTFS_SKELETON_DEFAULT && !BR2_PACKAGE_SKELETON_INIT_PORTABLE
 	depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_NETIFRC
 	help
 	  Set of scripts used by ifupdown (either the standalone one,
diff --git a/system/Config.in b/system/Config.in
index e71e57915..3e90e94cd 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -238,7 +238,7 @@  if BR2_ROOTFS_SKELETON_DEFAULT
 
 config BR2_TARGET_ENABLE_ROOT_LOGIN
 	bool "Enable root login with password"
-	default y
+	default y if !BR2_INIT_PORTABLE
 	select BR2_PACKAGE_HOST_MKPASSWD if BR2_TARGET_GENERIC_ROOT_PASSWD != ""
 	help
 	  Allow root to log in with a password.
@@ -280,7 +280,8 @@  config BR2_TARGET_GENERIC_ROOT_PASSWD
 
 choice
 	bool "/bin/sh"
-	default BR2_SYSTEM_BIN_SH_DASH if !BR2_PACKAGE_BUSYBOX
+	default BR2_SYSTEM_BIN_SH_DASH if !BR2_PACKAGE_BUSYBOX && !BR2_INIT_PORTABLE
+	default BR2_SYSTEM_BIN_SH_NONE if BR2_INIT_PORTABLE
 	help
 	  Select which shell will provide /bin/sh.
 
@@ -330,7 +331,7 @@  config BR2_SYSTEM_BIN_SH
 
 menuconfig BR2_TARGET_GENERIC_GETTY
 	bool "Run a getty (login prompt) after boot"
-	default y
+	default y if !BR2_INIT_PORTABLE
 
 if BR2_TARGET_GENERIC_GETTY
 config BR2_TARGET_GENERIC_GETTY_PORT
@@ -388,7 +389,7 @@  endif
 
 config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
 	bool "remount root filesystem read-write during boot"
-	default y
+	default y if !BR2_INIT_PORTABLE
 	help
 	  The root filesystem is typically mounted read-only at boot.
 	  By default, buildroot remounts it in read-write mode early