Deleted Added
full compact
main.c (344370) main.c (344377)
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * Copyright (c) 1998,2000 Doug Rabson <dfr@freebsd.org>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * Copyright (c) 1998,2000 Doug Rabson <dfr@freebsd.org>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: stable/11/stand/userboot/userboot/main.c 344370 2019-02-20 18:30:54Z kevans $");
29__FBSDID("$FreeBSD: stable/11/stand/userboot/userboot/main.c 344377 2019-02-20 19:13:09Z kevans $");
30
31#include <stand.h>
32#include <string.h>
33#include <setjmp.h>
34#include <sys/disk.h>
35
36#include "bootstrap.h"
37#include "disk.h"
38#include "libuserboot.h"
39
40#if defined(USERBOOT_ZFS_SUPPORT)
30
31#include <stand.h>
32#include <string.h>
33#include <setjmp.h>
34#include <sys/disk.h>
35
36#include "bootstrap.h"
37#include "disk.h"
38#include "libuserboot.h"
39
40#if defined(USERBOOT_ZFS_SUPPORT)
41#include "../zfs/libzfs.h"
41#include "libzfs.h"
42
43static void userboot_zfs_probe(void);
44static int userboot_zfs_found;
45#endif
46
47/* Minimum version required */
48#define USERBOOT_VERSION USERBOOT_VERSION_3
49

--- 189 unchanged lines hidden ---
42
43static void userboot_zfs_probe(void);
44static int userboot_zfs_found;
45#endif
46
47/* Minimum version required */
48#define USERBOOT_VERSION USERBOOT_VERSION_3
49

--- 189 unchanged lines hidden ---