diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-09-10 22:35:23 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-09-10 22:35:23 +0200 |
| commit | be7f3fb5e44b3f282a26fa7c6dd50a08677ae069 (patch) | |
| tree | 4b5a60eccf40827d6a615abdae1178efe7efb944 /sys/src/boot | |
| parent | 9af11534511370520f3fa03224ac5d367a97908d (diff) | |
rename pcf kernel to pc, remove pcf, pccpuf, pccpu64 kernels, update documentation
there isnt much of a point in keep maintaining separate
kernel configurations for terminal and cpu kernels as
the role can be switched with service=cpu boot parameter.
to make stuff cosistent, we will just have one "pc" kernel
and one "pc64" kernel configuration now.
Diffstat (limited to 'sys/src/boot')
| -rw-r--r-- | sys/src/boot/efi/mkfile | 8 | ||||
| -rw-r--r-- | sys/src/boot/pc/mkfile | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/src/boot/efi/mkfile b/sys/src/boot/efi/mkfile index 89ad24318..b19754d76 100644 --- a/sys/src/boot/efi/mkfile +++ b/sys/src/boot/efi/mkfile @@ -79,8 +79,8 @@ test.iso:D: efiboot.fat mkdir tmp/386 cp efiboot.fat tmp/386 cp /386/9bootiso tmp/386 - cp /386/9pcf tmp/386 - echo 'bootfile=/386/9pcf' >tmp/cfg/plan9.ini + cp /386/9pc tmp/386 + echo 'bootfile=/386/9pc' >tmp/cfg/plan9.ini disk/mk9660 -B 386/9bootiso -E 386/efiboot.fat -p <{echo +} -s tmp $target rm -r tmp @@ -95,8 +95,8 @@ test.fat:D: bootia32.efi bootx64.efi mkdir /n/esp/efi/boot cp bootia32.efi /n/esp/efi/boot cp bootx64.efi /n/esp/efi/boot - cp /386/9pcf /n/esp - echo 'bootfile=9pcf' >/n/esp/plan9.ini + cp /386/9pc /n/esp + echo 'bootfile=9pc' >/n/esp/plan9.ini unmount /n/esp rm /srv/$s diff --git a/sys/src/boot/pc/mkfile b/sys/src/boot/pc/mkfile index c5b00d246..ae9e90735 100644 --- a/sys/src/boot/pc/mkfile +++ b/sys/src/boot/pc/mkfile @@ -62,7 +62,7 @@ test.iso: 9bootiso 9boothyb 9bootfat mbr pbs mkdir tmp/386 mkdir tmp/cfg cp 9bootiso tmp/386 - cp /386/9pcf tmp/386 + cp /386/9pc tmp/386 cp /sys/lib/dist/cfg/plan9.ini tmp/cfg/plan9.ini echo wait >>tmp/cfg/plan9.ini disk/mk9660 -B 386/9bootiso -p <{echo +} -s tmp $target @@ -86,8 +86,8 @@ test.dsk: 9bootfat mbr pbs test.iso mkdir tmp cp test.iso 9bootfat tmp mkdir tmp/386 - cp /386/9pcf tmp/386 - echo 'bootfile=/386/9pcf' >tmp/plan9.ini + cp /386/9pc tmp/386 + echo 'bootfile=/386/9pc' >tmp/plan9.ini dd -if /dev/zero -of $target -bs 512 -count 32768 disk/partfs -m /n/$target $target disk=/n/$target/sdXX |