From a3fd209abe722c227e8c9e7a46a710df9223fafd Mon Sep 17 00:00:00 2001 From: Oleg Date: Thu, 10 Feb 2022 17:02:09 +0300 Subject: [PATCH] fix extlinux.conf (#3468) --- lib/debootstrap.sh | 2 +- lib/distributions.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh index c2371d040c..e3d209843b 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -765,7 +765,7 @@ PREPARE_IMAGE_SIZE # create extlinux config if [[ -f $SDCARD/boot/extlinux/extlinux.conf ]]; then - echo " APPEND root=$rootfs $SRC_CMDLINE $MAIN_CMDLINE" >> $SDCARD/boot/extlinux/extlinux.conf + echo " append root=$rootfs $SRC_CMDLINE $MAIN_CMDLINE" >> $SDCARD/boot/extlinux/extlinux.conf [[ -f $SDCARD/boot/armbianEnv.txt ]] && rm $SDCARD/boot/armbianEnv.txt fi diff --git a/lib/distributions.sh b/lib/distributions.sh index a2f12f48af..3ec270dd92 100644 --- a/lib/distributions.sh +++ b/lib/distributions.sh @@ -174,16 +174,16 @@ install_common() if [[ $SRC_EXTLINUX == yes ]]; then mkdir -p $SDCARD/boot/extlinux cat <<-EOF > "$SDCARD/boot/extlinux/extlinux.conf" - LABEL ${VENDOR} - LINUX /boot/$NAME_KERNEL - INITRD /boot/$NAME_INITRD + label ${VENDOR} + kernel /boot/$NAME_KERNEL + initrd /boot/$NAME_INITRD EOF if [[ -n $BOOT_FDT_FILE ]]; then if [[ $BOOT_FDT_FILE != "none" ]]; then - echo " FDT /boot/dtb/$BOOT_FDT_FILE" >> "$SDCARD/boot/extlinux/extlinux.conf" + echo " fdt /boot/dtb/$BOOT_FDT_FILE" >> "$SDCARD/boot/extlinux/extlinux.conf" fi else - echo " FDTDIR /boot/dtb/" >> "$SDCARD/boot/extlinux/extlinux.conf" + echo " fdtdir /boot/dtb/" >> "$SDCARD/boot/extlinux/extlinux.conf" fi else