| zfsboot.c (241294) | zfsboot.c (241301) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 Robert Nordier 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms are freely 6 * permitted provided that the above copyright notice and this 7 * paragraph and the following disclaimer are duplicated in all 8 * such forms. 9 * 10 * This software is provided "AS IS" and without any express or 11 * implied warranties, including, without limitation, the implied 12 * warranties of merchantability and fitness for a particular 13 * purpose. 14 */ 15 16#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1998 Robert Nordier 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms are freely 6 * permitted provided that the above copyright notice and this 7 * paragraph and the following disclaimer are duplicated in all 8 * such forms. 9 * 10 * This software is provided "AS IS" and without any express or 11 * implied warranties, including, without limitation, the implied 12 * warranties of merchantability and fitness for a particular 13 * purpose. 14 */ 15 16#include <sys/cdefs.h> |
| 17__FBSDID("$FreeBSD: head/sys/boot/i386/zfsboot/zfsboot.c 241294 2012-10-06 19:48:15Z avg $"); | 17__FBSDID("$FreeBSD: head/sys/boot/i386/zfsboot/zfsboot.c 241301 2012-10-06 20:08:29Z avg $"); |
| 18 19#include <sys/param.h> 20#include <sys/errno.h> 21#include <sys/diskmbr.h> 22#ifdef GPT 23#include <sys/gpt.h> 24#endif 25#include <sys/reboot.h> --- 754 unchanged lines hidden (view full) --- 780 } 781 for (i = 0; c != optstr[i]; i++) 782 if (i == NOPT - 1) 783 return -1; 784 opts ^= OPT_SET(flags[i]); 785 } 786 ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) : 787 OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD; | 18 19#include <sys/param.h> 20#include <sys/errno.h> 21#include <sys/diskmbr.h> 22#ifdef GPT 23#include <sys/gpt.h> 24#endif 25#include <sys/reboot.h> --- 754 unchanged lines hidden (view full) --- 780 } 781 for (i = 0; c != optstr[i]; i++) 782 if (i == NOPT - 1) 783 return -1; 784 opts ^= OPT_SET(flags[i]); 785 } 786 ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) : 787 OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD; |
| 788 if (ioctrl & IO_SERIAL) 789 sio_init(115200 / comspeed); | 788 if (ioctrl & IO_SERIAL) { 789 if (sio_init(115200 / comspeed) != 0) 790 ioctrl &= ~IO_SERIAL; 791 } |
| 790 } if (c == '?') { 791 dnode_phys_t dn; 792 793 if (zfs_lookup(&zfsmount, arg, &dn) == 0) { 794 zap_list(spa, &dn); 795 } 796 return -1; 797 } else { --- 37 unchanged lines hidden --- | 792 } if (c == '?') { 793 dnode_phys_t dn; 794 795 if (zfs_lookup(&zfsmount, arg, &dn) == 0) { 796 zap_list(spa, &dn); 797 } 798 return -1; 799 } else { --- 37 unchanged lines hidden --- |