Deleted Added
full compact
auto (258421) auto (259621)
1#!/bin/sh
2#-
3# Copyright (c) 2011 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) 2011 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/auto 258421 2013-11-21 03:40:52Z dteske $
28# $FreeBSD: stable/10/usr.sbin/bsdinstall/scripts/auto 259621 2013-12-19 18:52:41Z dteske $
29#
30############################################################ INCLUDES
31
32BSDCFG_SHARE="/usr/share/bsdconfig"
33. $BSDCFG_SHARE/common.subr || exit 1
34
35############################################################ FUNCTIONS
36

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

44 exit 1
45 else
46 exec $0
47 fi
48}
49
50############################################################ MAIN
51
29#
30############################################################ INCLUDES
31
32BSDCFG_SHARE="/usr/share/bsdconfig"
33. $BSDCFG_SHARE/common.subr || exit 1
34
35############################################################ FUNCTIONS
36

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

44 exit 1
45 else
46 exec $0
47 fi
48}
49
50############################################################ MAIN
51
52# Don't send ESC on function-key 62/63 (left/right command key)
53f_quietly kbdcontrol -f 62 ''
54f_quietly kbdcontrol -f 63 ''
55
52f_dprintf "Began Installation at %s" "$( date )"
53
54rm -rf $BSDINSTALL_TMPETC
55mkdir $BSDINSTALL_TMPETC
56
57trap true SIGINT # This section is optional
58bsdinstall keymap
59

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

94 exec 3>&1
95 BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
96 MIRROR_BUTTON=$?
97 exec 3>&-
98 test $MIRROR_BUTTON -eq 0 || error
99 export BSDINSTALL_DISTSITE
100fi
101
56f_dprintf "Began Installation at %s" "$( date )"
57
58rm -rf $BSDINSTALL_TMPETC
59mkdir $BSDINSTALL_TMPETC
60
61trap true SIGINT # This section is optional
62bsdinstall keymap
63

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

98 exec 3>&1
99 BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
100 MIRROR_BUTTON=$?
101 exec 3>&-
102 test $MIRROR_BUTTON -eq 0 || error
103 export BSDINSTALL_DISTSITE
104fi
105
102rm $PATH_FSTAB
106rm -f $PATH_FSTAB
103touch $PATH_FSTAB
104
105PMODES="\
106Guided \"Partitioning Tool (Recommended for Beginners)\" \
107Manual \"Manually Configure Partitions (Expert)\" \
108Shell \"Open a shell and partition by hand\""
109
110CURARCH=$( uname -m )

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

115 *) # Booting ZFS Unspported
116 ;;
117esac
118
119exec 3>&1
120PARTMODE=`echo $PMODES | xargs dialog --backtitle "FreeBSD Installer" \
121 --title "Partitioning" \
122 --menu "How would you like to partition your disk?" \
107touch $PATH_FSTAB
108
109PMODES="\
110Guided \"Partitioning Tool (Recommended for Beginners)\" \
111Manual \"Manually Configure Partitions (Expert)\" \
112Shell \"Open a shell and partition by hand\""
113
114CURARCH=$( uname -m )

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

119 *) # Booting ZFS Unspported
120 ;;
121esac
122
123exec 3>&1
124PARTMODE=`echo $PMODES | xargs dialog --backtitle "FreeBSD Installer" \
125 --title "Partitioning" \
126 --menu "How would you like to partition your disk?" \
123 0 0 0 2>&1 1>&3`
124if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
127 0 0 0 2>&1 1>&3` || exit 1
125exec 3>&-
126
127case "$PARTMODE" in
128"Guided") # Guided
129 bsdinstall autopart || error
130 bsdinstall mount || error
131 ;;
132"Shell") # Shell

--- 136 unchanged lines hidden ---
128exec 3>&-
129
130case "$PARTMODE" in
131"Guided") # Guided
132 bsdinstall autopart || error
133 bsdinstall mount || error
134 ;;
135"Shell") # Shell

--- 136 unchanged lines hidden ---