From 7247a61e0be7e90aaa08876990e709bbe1052256 Mon Sep 17 00:00:00 2001 From: Viktor Mihajlovski Date: Thu, 28 Jun 2018 11:36:59 +0200 Subject: [PATCH] netboot: add BOOTIF support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The IPAPPEND option in the pxelinux config file can be used to pass information about the boot interface to the booted Linux kernel. The support for this option was missing and could lead to installation failures, e.g. using kickstart. Signed-off-by: Viktor Mihajlovski Signed-off-by: Jan Höppner --- CHANGELOG.md | 1 + netboot/mk-pxelinux-ramfs | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69494453..cabc68c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Release history for s390-tools (MIT version) For Linux kernel version: 4.18 Changes of existing tools: + - netboot: add BOOTIF support Bug Fixes: - mon_procd: fix parsing of /proc//stat diff --git a/netboot/mk-pxelinux-ramfs b/netboot/mk-pxelinux-ramfs index d89c10a4..cb0c28ee 100755 --- a/netboot/mk-pxelinux-ramfs +++ b/netboot/mk-pxelinux-ramfs @@ -373,6 +373,7 @@ fi kernel=$(/bin/grep -i "^[[:space:]]*kernel" /tmp/config | sed "s/^[[:space:]]*kernel[[:space:]]*//I") initrd=$(/bin/grep -i "^[[:space:]]*initrd" /tmp/config | sed "s/^[[:space:]]*initrd[[:space:]]*//I") append=$(/bin/grep -i "^[[:space:]]*append" /tmp/config | sed "s/^[[:space:]]*append[[:space:]]*//I") +ipappend=$(/bin/grep -i "^[[:space:]]*ipappend" /tmp/config | sed "s/^[[:space:]]*ipappend[[:space:]]*//I") if [ -z "$kernel" ] then @@ -396,6 +397,9 @@ if [ -z "$append" ]; then echo "Kexec load: kexec -l /tmp/kernel $INITRD" kexec -l /tmp/kernel $INITRD else + if [ "$ipappend" = "2" ]; then + $append="$append BOOTIF=01-$ifaddr" + fi echo "Kexec load: kexec -l /tmp/kernel $INITRD --append=\"$append\"" kexec -l /tmp/kernel $INITRD --append="$append" fi