Deleted Added
full compact
script (264449) script (264472)
1#!/bin/sh
2#-
3# Copyright (c) 2013 Nathan Whitehorn
4# Copyright (c) 2013 Devin Teske
5# All rights reserved.
6#
7# Redistribution and use in source and binary forms, with or without
8# modification, are permitted provided that the following conditions

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

20# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26# SUCH DAMAGE.
27#
1#!/bin/sh
2#-
3# Copyright (c) 2013 Nathan Whitehorn
4# Copyright (c) 2013 Devin Teske
5# All rights reserved.
6#
7# Redistribution and use in source and binary forms, with or without
8# modification, are permitted provided that the following conditions

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

20# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26# SUCH DAMAGE.
27#
28# $FreeBSD: stable/10/usr.sbin/bsdinstall/scripts/script 264449 2014-04-14 05:37:21Z dteske $
28# $FreeBSD: stable/10/usr.sbin/bsdinstall/scripts/script 264472 2014-04-14 21:04:58Z dteske $
29#
30############################################################ INCLUDES
31
32BSDCFG_SHARE="/usr/share/bsdconfig"
33. $BSDCFG_SHARE/common.subr || exit 1
34f_dprintf "%s: loading includes..." "$0"
35f_include $BSDCFG_SHARE/dialog.subr
36f_include $BSDCFG_SHARE/variable.subr

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

90 f_quietly f_debug_init
91 # NB: Being scripted, let debug go to terminal for invalid debugFile
92 f_dprintf "Began Instalation at %s" "$( date )"
93fi
94
95# Make partitions
96rm -f $PATH_FSTAB
97touch $PATH_FSTAB
29#
30############################################################ INCLUDES
31
32BSDCFG_SHARE="/usr/share/bsdconfig"
33. $BSDCFG_SHARE/common.subr || exit 1
34f_dprintf "%s: loading includes..." "$0"
35f_include $BSDCFG_SHARE/dialog.subr
36f_include $BSDCFG_SHARE/variable.subr

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

90 f_quietly f_debug_init
91 # NB: Being scripted, let debug go to terminal for invalid debugFile
92 f_dprintf "Began Instalation at %s" "$( date )"
93fi
94
95# Make partitions
96rm -f $PATH_FSTAB
97touch $PATH_FSTAB
98bsdinstall scriptedpart "$PARTITIONS"
98if [ "$ZFSBOOT_DISKS" ]; then
99 bsdinstall zfsboot
100else
101 bsdinstall scriptedpart "$PARTITIONS"
102fi
99bsdinstall mount
100
101# Unpack distributions
102bsdinstall checksum
103bsdinstall distextract
104
105# Finalize install
106bsdinstall config

--- 26 unchanged lines hidden ---
103bsdinstall mount
104
105# Unpack distributions
106bsdinstall checksum
107bsdinstall distextract
108
109# Finalize install
110bsdinstall config

--- 26 unchanged lines hidden ---