| zfsboot.c (199579) | zfsboot.c (199714) |
|---|---|
| 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 199579 2009-11-20 12:48:35Z jhb $"); | 17__FBSDID("$FreeBSD: head/sys/boot/i386/zfsboot/zfsboot.c 199714 2009-11-23 16:00:16Z rnoland $"); |
| 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> --- 53 unchanged lines hidden (view full) --- 79 OPT_SET(RBX_SERIAL) | OPT_SET(RBX_CDROM) | \ 80 OPT_SET(RBX_GDB ) | OPT_SET(RBX_MUTE) | \ 81 OPT_SET(RBX_PAUSE) | OPT_SET(RBX_DUAL)) 82 83/* Hint to loader that we came from ZFS */ 84#define KARGS_FLAGS_ZFS 0x4 85 86#define PATH_CONFIG "/boot.config" | 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> --- 53 unchanged lines hidden (view full) --- 79 OPT_SET(RBX_SERIAL) | OPT_SET(RBX_CDROM) | \ 80 OPT_SET(RBX_GDB ) | OPT_SET(RBX_MUTE) | \ 81 OPT_SET(RBX_PAUSE) | OPT_SET(RBX_DUAL)) 82 83/* Hint to loader that we came from ZFS */ 84#define KARGS_FLAGS_ZFS 0x4 85 86#define PATH_CONFIG "/boot.config" |
| 87#define PATH_BOOT3 "/boot/loader" | 87#define PATH_BOOT3 "/boot/zfsloader" |
| 88#define PATH_KERNEL "/boot/kernel/kernel" 89 90#define ARGS 0x900 91#define NOPT 14 92#define NDEV 3 93#define MEM_BASE 0x12 94#define MEM_EXT 0x15 95#define V86_CY(x) ((x) & 1) --- 978 unchanged lines hidden --- | 88#define PATH_KERNEL "/boot/kernel/kernel" 89 90#define ARGS 0x900 91#define NOPT 14 92#define NDEV 3 93#define MEM_BASE 0x12 94#define MEM_EXT 0x15 95#define V86_CY(x) ((x) & 1) --- 978 unchanged lines hidden --- |