Deleted Added
full compact
jail (256340) jail (258421)
1#!/bin/sh
2#-
3# Copyright (c) 2011 Nathan Whitehorn
1#!/bin/sh
2#-
3# Copyright (c) 2011 Nathan Whitehorn
4# Copyright (c) 2013 Devin Teske
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:
9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright

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

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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#
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
9# are met:
10# 1. Redistributions of source code must retain the above copyright
11# notice, this list of conditions and the following disclaimer.
12# 2. Redistributions in binary form must reproduce the above copyright

--- 7 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#
27# $FreeBSD: stable/10/usr.sbin/bsdinstall/scripts/jail 256340 2013-10-11 20:28:30Z des $
28# $FreeBSD: stable/10/usr.sbin/bsdinstall/scripts/jail 258421 2013-11-21 03:40:52Z dteske $
29#
30############################################################ INCLUDES
28
31
29echo "Begun Installation at $(date)" > $BSDINSTALL_LOG
32BSDCFG_SHARE="/usr/share/bsdconfig"
33. $BSDCFG_SHARE/common.subr || exit 1
34
35############################################################ MAIN
36
37f_dprintf "Began Installation at %s" "$( date )"
30export BSDINSTALL_CHROOT=$1
31
32error() {
33 dialog --backtitle "FreeBSD Installer" --title "Abort" \
34 --no-label "Exit" --yes-label "Restart" --yesno \
35 "An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0
36 if [ $? -ne 0 ]; then
37 exit

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

107
108trap error SIGINT # SIGINT is bad again
109bsdinstall config || error
110cp /etc/resolv.conf $1/etc
111cp /etc/localtime $1/etc
112
113bsdinstall entropy
114
38export BSDINSTALL_CHROOT=$1
39
40error() {
41 dialog --backtitle "FreeBSD Installer" --title "Abort" \
42 --no-label "Exit" --yes-label "Restart" --yesno \
43 "An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0
44 if [ $? -ne 0 ]; then
45 exit

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

115
116trap error SIGINT # SIGINT is bad again
117bsdinstall config || error
118cp /etc/resolv.conf $1/etc
119cp /etc/localtime $1/etc
120
121bsdinstall entropy
122
115echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG
123f_dprintf "Installation Completed at %s" "$(date)"
116
124
125################################################################################
126# END
127################################################################################