pxe-network-installer: fix kernel options in pxelinux.cfg.files 30/3930/1
authorJackie Huang <jackie.huang@windriver.com>
Fri, 29 May 2020 09:42:13 +0000 (17:42 +0800)
committerJackie Huang <jackie.huang@windriver.com>
Mon, 1 Jun 2020 05:07:52 +0000 (13:07 +0800)
The anaconda in yocto handles the kernel options differently, so
do the following changes to ensure the installer starts correctly:
- inst.ks -> ks
- append LABEL=initrd-install

Issue-ID: INF-139
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I2a127405b144437fd9d5ff612b09b700b2028035

meta-stx/recipes-core/stx-metal/pxe-network-installer.inc

index d7227f3..8658e2c 100644 (file)
@@ -66,7 +66,10 @@ do_install_prepend () {
        install -m 644 efi-centos-pxe-worker_lowlatency-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-worker_lowlatency-install-${STX_REL}
        install -m 644 efi-centos-pxe-smallsystem_lowlatency-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem_lowlatency-install-${STX_REL}
 
-       sed -i "s/xxxSW_VERSIONxxx/${STX_REL}/g" ${D}/pxeboot/pxelinux.cfg.files/pxe-* ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-* 
+       sed -i -e "s/xxxSW_VERSIONxxx/${STX_REL}/g" \
+              -e "s/inst.ks/ks/g" \
+              -e "s/\(xxxAPPEND_OPTIONSxxx\)/LABEL=initrd-install \1/" \
+              ${D}/pxeboot/pxelinux.cfg.files/pxe-* ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-*
        
        # Copy Titanium grub.cfg. It will be used to create ISO on the Controller.
        install -m 0644 ${S}/bsp-files/grub.cfg ${D}/pxeboot/EFI/