The proposed renaming of run-init to switch_root in klibc never happened. switch_root is only ever provided by busybox. We're about to add a further dependency on run-init, so always use that.
Signed-off-by: Ben Hutchings <[email protected]> --- init | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/init b/init index 23feb73..0a862f2 100755 --- a/init +++ b/init @@ -324,10 +324,6 @@ mount -n -o move /sys ${rootmnt}/sys mount -n -o move /proc ${rootmnt}/proc # Chain to real filesystem -if [ -z "$drop_caps" ] && command -v switch_root >/dev/null 2>&1; then - exec switch_root ${rootmnt} ${init} "$@" <${rootmnt}/dev/console >${rootmnt}/dev/console 2>&1 -elif command -v run-init >/dev/null 2>&1; then - exec run-init ${drop_caps} ${rootmnt} ${init} "$@" <${rootmnt}/dev/console >${rootmnt}/dev/console 2>&1 -fi +exec run-init ${drop_caps} ${rootmnt} ${init} "$@" <${rootmnt}/dev/console >${rootmnt}/dev/console 2>&1 echo "Something went badly wrong in the initramfs." panic "Please file a bug on initramfs-tools."
signature.asc
Description: Digital signature
