diff options
author | jhb <jhb@FreeBSD.org> | 2011-12-20 15:19:29 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2011-12-20 15:19:29 +0000 |
commit | 2fa7cf8a54af92319bc1a08f666ee13551b12207 (patch) | |
tree | 8f352c4469c3c5ab00568b543c364b9bc5229d97 /usr.sbin | |
parent | 1eeaa2989fb2285b0318968605f3fe7826f8e863 (diff) | |
download | FreeBSD-src-2fa7cf8a54af92319bc1a08f666ee13551b12207.zip FreeBSD-src-2fa7cf8a54af92319bc1a08f666ee13551b12207.tar.gz |
Allow boot0cfg to force a PXE boot via boot0 on the next boot.
- Fix boot0 to check for PXE when using the pre-set setting for the
preferred slice.
- Update boot0cfg to use slice 6 to select PXE. Accept a 'pxe' argument
instead of a number for the 's' option as a way to select PXE as well.
Submitted by: Andrew Boyer aboyer averesystems
MFC after: 2 weeks
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/boot0cfg/boot0cfg.8 | 3 | ||||
-rw-r--r-- | usr.sbin/boot0cfg/boot0cfg.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8 index a359ffa..1efd305 100644 --- a/usr.sbin/boot0cfg/boot0cfg.8 +++ b/usr.sbin/boot0cfg/boot0cfg.8 @@ -146,6 +146,9 @@ Set the default boot selection to .Ar slice . Values between 1 and 4 refer to slices; a value of 5 refers to the option of booting from a second disk. +The special string +.Dq PXE +or a value of 6 can be used to boot via PXE. .It Fl t Ar ticks Set the timeout value to .Ar ticks . diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c index 935f85b..2602e50 100644 --- a/usr.sbin/boot0cfg/boot0cfg.c +++ b/usr.sbin/boot0cfg/boot0cfg.c @@ -169,7 +169,10 @@ main(int argc, char *argv[]) o_flag = 1; break; case 's': - s_arg = argtoi(optarg, 1, 5, 's'); + if (strcasecmp(optarg, "pxe") == 0) + s_arg = 6; + else + s_arg = argtoi(optarg, 1, 6, 's'); break; case 't': t_arg = argtoi(optarg, 1, 0xffff, 't'); @@ -472,8 +475,10 @@ display_mbr(u_int8_t *mbr) printf("default_selection=F%d (", mbr[OFF_OPT] + 1); if (mbr[OFF_OPT] < 4) printf("Slice %d", mbr[OFF_OPT] + 1); - else + else if (mbr[OFF_OPT] == 4) printf("Drive 1"); + else + printf("PXE"); printf(")\n"); } |