From ae974db1aa9dd9a0c6c72c8086b44ff9b4a3ecf4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Aug 2021 12:19:18 +0300 Subject: [PATCH] busybox: use baseinit by default when no inittab present --- core/busybox/checksums | 1 + core/busybox/patches/init-use-baseinit.patch | 13 +++++++++++++ core/busybox/sources | 1 + core/busybox/version | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 core/busybox/patches/init-use-baseinit.patch diff --git a/core/busybox/checksums b/core/busybox/checksums index 013e7f45..092d5f8a 100644 --- a/core/busybox/checksums +++ b/core/busybox/checksums @@ -6,6 +6,7 @@ dbc9c73cce208e428de003d785bf88cc9f27c86d4b784adf32738f8b073cbe9a f0e17fefc0af6b10205d72b242b6ef7481a58ff07726c62890ebc5893b96a396 73be7b16dcff44e88eb48696522794f529beddf9d5a139b8a76cc8685a9f6fc8 d70c4cd6381baeb3836c0387f53553021b48bdc851de49f1c86d836f7d0355fc +b030d6ac2b3284cf3cc0a2eec886d26b7e09ea59feb460a6a09165da62a582b4 c8a6fc95a75fa355d570c14e214d68a618e060a486b824b83b5140b9c6a894a7 5f3d6cbdc7060deab644555201365e6dd15ffed07d341532c3d82a170e95c0bd 423c3a67ad56b290ef73440cb748dbc3c6ee2ec486683b5e19242a804db8085b diff --git a/core/busybox/patches/init-use-baseinit.patch b/core/busybox/patches/init-use-baseinit.patch new file mode 100644 index 00000000..7a14a416 --- /dev/null +++ b/core/busybox/patches/init-use-baseinit.patch @@ -0,0 +1,13 @@ +diff --git a/init/init.c b/init/init.c +index efab5dc..5135de3 100644 +--- a/init/init.c ++++ b/init/init.c +@@ -153,7 +153,7 @@ + + /* Default sysinit script. */ + #ifndef INIT_SCRIPT +-# define INIT_SCRIPT "/etc/init.d/rcS" ++# define INIT_SCRIPT "/usr/lib/init/rc.boot" + #endif + + /* Each type of actions can appear many times. They will be diff --git a/core/busybox/sources b/core/busybox/sources index 1002ab1b..a273844f 100644 --- a/core/busybox/sources +++ b/core/busybox/sources @@ -6,6 +6,7 @@ patches/print-unicode.patch patch patches/install-fix-chown.patch patch patches/lsusb-vendor-product.patch patch patches/unzip-usage-no-error.patch patch +patches/init-use-baseinit.patch patch patches/fix-UB.patch patch-clang files/.config files/.config-suid diff --git a/core/busybox/version b/core/busybox/version index b840c21d..9ca1bf24 100644 --- a/core/busybox/version +++ b/core/busybox/version @@ -1 +1 @@ -1.34.0 2 +1.34.0 3