diff options
-rw-r--r-- | share/man/man8/nanobsd.8 | 14 | ||||
-rw-r--r-- | tools/tools/nanobsd/nanobsd.sh | 8 |
2 files changed, 21 insertions, 1 deletions
diff --git a/share/man/man8/nanobsd.8 b/share/man/man8/nanobsd.8 index 3982d5c..aaeedb5 100644 --- a/share/man/man8/nanobsd.8 +++ b/share/man/man8/nanobsd.8 @@ -197,6 +197,18 @@ Build name (used to construct the working directory names). Path to the source tree used to build the image. .It Va NANO_KERNEL Name of the kernel configuration file used to build the kernel. +.It Va NANO_BOOT0CFG +Controls the options passed to +.Xr boot0cfg 8 +; these dictate boot0's behaviour. +.It Va NANO_BOOTLOADER +The boot0 loader to use relative to the ${NANO_WORLDDIR} variable. +This defaults to +.Pa boot/boot0sio +and should be overridden to +.Pa boot/boot0 +to provide a VGA +console. .It Va CONF_BUILD Options passed to the .Cm buildworld @@ -293,6 +305,8 @@ customize_cmd cust_etc_size .Ed .Sh SEE ALSO .Xr make.conf 5 , +.Xr boot 8 , +.Xr boot0cfg 8 , .Xr picobsd 8 .Sh HISTORY The diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh index e2ddf7c..868d784 100644 --- a/tools/tools/nanobsd/nanobsd.sh +++ b/tools/tools/nanobsd/nanobsd.sh @@ -103,6 +103,10 @@ NANO_RAM_TMPVARSIZE=10240 NANO_SECTS=32 NANO_HEADS=16 +# boot0 flags/options and configuration +NANO_BOOT0CFG="-o packet -s 1 -m 3" +NANO_BOOTLOADER="boot/boot0sio" + ####################################################################### # Not a variable at this time @@ -364,7 +368,7 @@ create_i386_diskimage ( ) ( fdisk ${MD} # XXX: params # XXX: pick up cached boot* files, they may not be in image anymore. - boot0cfg -B -b ${NANO_WORLDDIR}/boot/boot0sio -o packet -s 1 -m 3 ${MD} + boot0cfg -B -b ${NANO_WORLDDIR}/${NANO_BOOTLOADER} ${NANO_BOOT0CFG} ${MD} bsdlabel -w -B -b ${NANO_WORLDDIR}/boot/boot ${MD}s1 bsdlabel ${MD}s1 @@ -573,6 +577,8 @@ export NANO_SECTS export NANO_SRC export NANO_TOOLS export NANO_WORLDDIR +export NANO_BOOT0CFG +export NANO_BOOTLOADER ####################################################################### # And then it is as simple as that... |