lt-qcom-linux-test: Android bootrr image switch to use systemd

- Remove custom init script
- Update boot prompts in LAVA jobs

Change-Id: Ia4eee41b5e94e9adfe5ef1dca64566d5cb526984
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>

4 files changed, 4 insertions, 60 deletions

diff --git a/lt-qcom-linux-test/builders.sh b/lt-qcom-linux-test/builders.sh
index 3b04aeb5..13e22a0b 100755
--- a/lt-qcom-linux-test/builders.sh
+++ b/lt-qcom-linux-test/builders.sh
@@ -276,13 +276,7 @@ if [[ ! -z "${BOOTRR_GIT_REPO}" ]]; then
 	ramdisk_file=$overlayed_ramdisk_file
 fi
 
-# Create boot image (bootrr), overlay the init script to setup the ramdisk
-init_file=init
-cp configs/lt-qcom-linux-test/initscripts/init.sh ./$init_file
-chmod +x ./$init_file
-overlayed_ramdisk_file="out/$(overlay_ramdisk_from_file "$init_file" "init_ramdisk")"
-rm -f $init_file
-
+# Create boot image (bootrr), uses systemd autologin root
 boot_file=boot-${KERNEL_FLAVOR}-${KERNEL_VERSION}-${BUILD_NUMBER}-${MACHINE}.img
 skales-mkbootimg \
 	--kernel $kernel_file \
@@ -292,7 +286,7 @@ skales-mkbootimg \
 	--pagesize "${BOOTIMG_PAGESIZE}" \
 	--base "${BOOTIMG_BASE}" \
 	--ramdisk_base "${RAMDISK_BASE}" \
-	--cmdline "root=/dev/ram0 init=/init rw console=tty0 console=${SERIAL_CONSOLE},115200n8"
+	--cmdline "root=/dev/ram0 init=/sbin/init rw console=tty0 console=${SERIAL_CONSOLE},115200n8"
 
 # Create boot image (functional), sdm845-mtp requires an initramfs to mount the rootfs and then
 # exec switch_rootfs, use the same method in other boards too
diff --git a/lt-qcom-linux-test/initscripts/init.sh b/lt-qcom-linux-test/initscripts/init.sh
deleted file mode 100644
index 2cab1e73..00000000
--- a/lt-qcom-linux-test/initscripts/init.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-HOME=/root
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-PS1="linaro-test [rc=$(echo \$?)]# "
-export HOME PS1 PATH
-
-do_mount_fs() {
-	grep -q "$1" /proc/filesystems || return
-	test -d "$2" || mkdir -p "$2"
-	mount -t "$1" "$1" "$2"
-}
-
-do_mknod() {
-	test -e "$1" || mknod "$1" "$2" "$3" "$4"
-}
-
-mkdir -p /proc
-mount -t proc proc /proc
-
-do_mount_fs sysfs /sys
-do_mount_fs debugfs /sys/kernel/debug
-do_mount_fs devtmpfs /dev
-do_mount_fs devpts /dev/pts
-do_mount_fs tmpfs /dev/shm
-
-mkdir -p /run
-mkdir -p /var/run
-
-/sbin/udevd --daemon
-/bin/udevadm trigger
-
-do_mknod /dev/console c 5 1
-do_mknod /dev/null c 1 3
-do_mknod /dev/zero c 1 5
-
-echo -n 'BOOT TIME: '
-cat /proc/uptime
-
-if $(grep -q bootrr-auto /proc/cmdline); then
-	for TEST in $(tr "\0" "\n" < /proc/device-tree/compatible); do
-		if [ -x "/usr/bin/${TEST}" ]; then
-			/usr/bin/${TEST}
-		fi
-	done
-
-	echo ~~~~~~~~~~~~~~~~~~~~~
-fi
-
-exec sh </dev/console >/dev/console 2>/dev/console
diff --git a/lt-qcom-linux-test/lava-job-definitions/boards/template-bootrr.yaml b/lt-qcom-linux-test/lava-job-definitions/boards/template-bootrr.yaml
index e8b1ec55..904edf63 100644
--- a/lt-qcom-linux-test/lava-job-definitions/boards/template-bootrr.yaml
+++ b/lt-qcom-linux-test/lava-job-definitions/boards/template-bootrr.yaml
@@ -152,7 +152,7 @@ actions:
 - boot:
     namespace: ${LAVA_DEVICE_TYPE}
     prompts:
-    - 'linaro-test .*#'
+    - 'root@(.*):~#'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/lt-qcom-linux-test/lava-job-definitions/sdm845-mtp/template-bootrr.yaml b/lt-qcom-linux-test/lava-job-definitions/sdm845-mtp/template-bootrr.yaml
index 4770edbe..22b41fa4 100644
--- a/lt-qcom-linux-test/lava-job-definitions/sdm845-mtp/template-bootrr.yaml
+++ b/lt-qcom-linux-test/lava-job-definitions/sdm845-mtp/template-bootrr.yaml
@@ -135,7 +135,7 @@ actions:
 - boot:
     namespace: ${LAVA_DEVICE_TYPE}
     prompts:
-    - 'linaro-test .*#'
+    - 'root@(.*):~#'
     timeout:
       minutes: 15
     method: fastboot