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 /sys/boot | |
| 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 'sys/boot')
| -rw-r--r-- | sys/boot/i386/boot0/boot0.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/i386/boot0/boot0.S b/sys/boot/i386/boot0/boot0.S index 2950124..798ee97 100644 --- a/sys/boot/i386/boot0/boot0.S +++ b/sys/boot/i386/boot0/boot0.S @@ -413,6 +413,7 @@ got_key: 3: #endif /* ONLY_F_KEYS */ #endif /* SIO */ +check_selection: cmpb $0x5,%al # F1..F6 or 1..6 ? #ifdef PXE /* enable PXE/INT18 using F6 */ jne 1f; @@ -421,7 +422,6 @@ got_key: #endif /* PXE */ jae beep # Not in F1..F5, beep -check_selection: /* * We have a selection. If it's a bad selection go back to complain. * The bits in MNUOPT were set when the options were printed. |
