From 2da7a9f3514dc61d16c2ea9a5375f8bba212c245 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 25 Aug 2020 13:32:23 +0200 Subject: [PATCH] init: drop INIT_UNIT logic This is now handled by the libreelec-target-generator systemd generator. Signed-off-by: Matthias Reichl --- packages/sysutils/busybox/scripts/init | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 983a85e11c..b747a53e88 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -1005,11 +1005,7 @@ for arg in $(cat /proc/cmdline); do wol_wait=*) wol_wait="${arg#*=}" ;; - textmode) - INIT_UNIT="--unit=textmode.target" - ;; installer) - INIT_UNIT="--unit=installer.target" SYSLINUX_DEFAULT="installer" ;; debugging) @@ -1134,19 +1130,7 @@ if [ "$STORAGE_NETBOOT" = "yes" ]; then echo "" > /sysroot/dev/.storage_netboot fi -BACKUP_FILE=$(ls -1 /sysroot/storage/.restore/*.tar 2>/dev/null | head -n 1) - -if [ -f /sysroot/storage/.please_resize_me ]; then - INIT_UNIT="--unit=fs-resize.target" -elif [ -f /sysroot/storage/.cache/reset_oe -o -f /sysroot/storage/.cache/reset_xbmc ]; then - INIT_UNIT="--unit=factory-reset.target" -elif [ -f "$BACKUP_FILE" ]; then - INIT_UNIT="--unit=backup-restore.target" -elif [ -f /sysroot/storage/.rpi_flash_firmware ]; then - INIT_UNIT="--unit=rpi-flash-firmware.target" -fi - # switch to new sysroot and start real init -exec /usr/bin/busybox switch_root /sysroot /usr/lib/systemd/systemd $INIT_ARGS $INIT_UNIT +exec /usr/bin/busybox switch_root /sysroot /usr/lib/systemd/systemd $INIT_ARGS error "switch_root" "Error in initramfs. Could not switch to new root"