board/common,ntpd: fix missing /bin/sh and /bin/bash symlinks

Also, disable getty on /dev/console. Not used anymore with tini. Signed-off-by: Joachim Wiberg <[email protected]>
kernelkit · Jan 30, 2024 · e58a657 · e58a657
1 parent ad4f008
commit e58a657
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/board/common/busybox-tiny_defconfig b/board/common/busybox-tiny_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.36.0
-# Tue Jan 30 16:15:21 2024
+# Tue Jan 30 16:38:03 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -1120,9 +1120,9 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 CONFIG_SH_IS_ASH=y
 # CONFIG_SH_IS_HUSH is not set
 # CONFIG_SH_IS_NONE is not set
-# CONFIG_BASH_IS_ASH is not set
+CONFIG_BASH_IS_ASH=y
 # CONFIG_BASH_IS_HUSH is not set
-CONFIG_BASH_IS_NONE=y
+# CONFIG_BASH_IS_NONE is not set
 CONFIG_SHELL_ASH=y
 CONFIG_ASH=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y

diff --git a/configs/curios-ntpd_amd64_defconfig b/configs/curios-ntpd_amd64_defconfig
@@ -8,12 +8,12 @@ BR2_STATIC_LIBS=y
 BR2_TARGET_GENERIC_HOSTNAME="curiOS"
 BR2_TARGET_GENERIC_ISSUE="Welcome to curiOS"
 BR2_INIT_NONE=y
-BR2_SYSTEM_BIN_SH_NONE=y
+# BR2_TARGET_GENERIC_GETTY is not set
+# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-build.sh"
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_CURIOS_PATH}/board/common/busybox-tiny_defconfig"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
-BR2_PACKAGE_TINI=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_NTP_NTP_KEYGEN=y
@@ -22,7 +22,7 @@ BR2_PACKAGE_NTP_NTPDC=y
 BR2_PACKAGE_NTP_NTPQ=y
 BR2_PACKAGE_NTP_NTPTIME=y
 BR2_PACKAGE_NTP_TICKADJ=y
-# BR2_PACKAGE_URANDOM_SCRIPTS is not set
+BR2_PACKAGE_TINI=y
 BR2_TARGET_ROOTFS_OCI=y
 BR2_TARGET_ROOTFS_OCI_AUTHOR="curiOS"
 BR2_TARGET_ROOTFS_OCI_TAG="edge"

diff --git a/configs/curios-ntpd_arm64_defconfig b/configs/curios-ntpd_arm64_defconfig
@@ -9,12 +9,12 @@ BR2_STATIC_LIBS=y
 BR2_TARGET_GENERIC_HOSTNAME="curiOS"
 BR2_TARGET_GENERIC_ISSUE="Welcome to curiOS"
 BR2_INIT_NONE=y
-BR2_SYSTEM_BIN_SH_NONE=y
+# BR2_TARGET_GENERIC_GETTY is not set
+# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-build.sh"
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_CURIOS_PATH}/board/common/busybox-tiny_defconfig"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
-BR2_PACKAGE_TINI=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_NTP_NTP_KEYGEN=y
@@ -23,7 +23,7 @@ BR2_PACKAGE_NTP_NTPDC=y
 BR2_PACKAGE_NTP_NTPQ=y
 BR2_PACKAGE_NTP_NTPTIME=y
 BR2_PACKAGE_NTP_TICKADJ=y
-# BR2_PACKAGE_URANDOM_SCRIPTS is not set
+BR2_PACKAGE_TINI=y
 BR2_TARGET_ROOTFS_OCI=y
 BR2_TARGET_ROOTFS_OCI_AUTHOR="curiOS"
 BR2_TARGET_ROOTFS_OCI_TAG="edge"