From c197fede614a623b4363dcc313130aff738e25b8 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Fri, 5 Jan 2018 08:38:23 +0100 Subject: [PATCH] inst: determine kernel for bootsetup from $bootfile and $cputype --- rc/bin/inst/bootsetup | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rc/bin/inst/bootsetup b/rc/bin/inst/bootsetup index c08adc346..cd686fb57 100755 --- a/rc/bin/inst/bootsetup +++ b/rc/bin/inst/bootsetup @@ -30,8 +30,9 @@ case go 9fat=$rd export 9fat + bootfile=`{basename $bootfile} + if(! test -f /tmp/plan9.ini) { - bootfile=9pc @{ echo 'bootfile='^$bootfile echo 'bootargs=local!'^$fs' '$"fsflags @@ -82,7 +83,7 @@ case go logprog mount -c /srv/dos /n/9fat $9fat - logprog rm -f /n/9fat/^(9bootfat plan9.ini 9pc) + logprog rm -f /n/9fat/^(9bootfat plan9.ini $bootfile) logprog cp /n/newfs/386/9bootfat /n/9fat/9bootfat # make file continous on disk @@ -92,7 +93,7 @@ case go logprog cp /tmp/plan9.ini /n/9fat/plan9.ini # copy kernel - logprog cp /n/newfs/386/9pc /n/9fat/9pc + logprog cp /n/newfs/$cputype/$bootfile /n/9fat/ # copy efi bootloader logprog mkdir -p /n/9fat/efi/boot