From efe33a0a9695d41d688c7c1c5203fafe4b2e6b8c Mon Sep 17 00:00:00 2001 From: "Tomas Kelemen (vudiq)" Date: Tue, 29 May 2018 09:23:01 +0200 Subject: [PATCH] platform_init: use labels defined by distro options --- packages/sysutils/busybox/package.mk | 3 +++ projects/Amlogic/initramfs/platform_init | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 601074ca24..71889680fe 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -218,6 +218,9 @@ makeinstall_init() { if find_file_path initramfs/platform_init; then cp ${FOUND_PATH} $INSTALL + sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \ + -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \ + -i $INSTALL/platform_init chmod 755 $INSTALL/platform_init fi diff --git a/projects/Amlogic/initramfs/platform_init b/projects/Amlogic/initramfs/platform_init index b82a0a71e7..b98b0fd07d 100755 --- a/projects/Amlogic/initramfs/platform_init +++ b/projects/Amlogic/initramfs/platform_init @@ -44,7 +44,7 @@ done if [ -z "$BOOT_IMAGE" -o -z "$boot" -o -z "$disk" ]; then cmdline=$(cat /proc/cmdline) if [ -n "$bootfromext" ]; then - cmdline="$cmdline BOOT_IMAGE=kernel.img boot=LABEL=LIBREELEC disk=LABEL=STORAGE" + cmdline="$cmdline BOOT_IMAGE=kernel.img boot=LABEL=@BOOT_LABEL@ disk=LABEL=@DISK_LABEL@" else cmdline="$cmdline BOOT_IMAGE=/dev/boot boot=/dev/system disk=/dev/data" fi