Deleted Added
full compact
zfsboot (297712) zfsboot (297713)
1#!/bin/sh
2#-
3# Copyright (c) 2013-2015 Allan Jude
4# Copyright (c) 2013-2015 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-2015 Allan Jude
4# Copyright (c) 2013-2015 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: head/usr.sbin/bsdinstall/scripts/zfsboot 297712 2016-04-08 15:05:06Z allanjude $
28# $FreeBSD: head/usr.sbin/bsdinstall/scripts/zfsboot 297713 2016-04-08 15:08:22Z allanjude $
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/device.subr
36f_include $BSDCFG_SHARE/dialog.subr

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

1251 f_eval_catch $funcname zfs "$ZFS_SET" \
1252 "mountpoint=/$zroot_name" "$zroot_name" ||
1253 return $FAILURE
1254
1255 # Touch up permissions on the tmp directories
1256 f_dprintf "$funcname: Modifying directory permissions..."
1257 local dir
1258 for dir in /tmp /var/tmp; do
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/device.subr
36f_include $BSDCFG_SHARE/dialog.subr

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

1251 f_eval_catch $funcname zfs "$ZFS_SET" \
1252 "mountpoint=/$zroot_name" "$zroot_name" ||
1253 return $FAILURE
1254
1255 # Touch up permissions on the tmp directories
1256 f_dprintf "$funcname: Modifying directory permissions..."
1257 local dir
1258 for dir in /tmp /var/tmp; do
1259 f_eval_catch $funcname mkdir "$MKDIR_P" \
1260 $BSDINSTALL_CHROOT$dir || return $FAILURE
1259 f_eval_catch $funcname chmod "$CHMOD_MODE" 1777 \
1260 $BSDINSTALL_CHROOT$dir || return $FAILURE
1261 done
1262
1263 # Create symlink(s)
1264 if [ "$ZFSBOOT_BOOT_POOL" ]; then
1265 f_dprintf "$funcname: Creating /boot symlink for boot pool..."
1266 f_eval_catch $funcname ln "$LN_SF" "$bootpool_name/boot" \

--- 369 unchanged lines hidden ---
1261 f_eval_catch $funcname chmod "$CHMOD_MODE" 1777 \
1262 $BSDINSTALL_CHROOT$dir || return $FAILURE
1263 done
1264
1265 # Create symlink(s)
1266 if [ "$ZFSBOOT_BOOT_POOL" ]; then
1267 f_dprintf "$funcname: Creating /boot symlink for boot pool..."
1268 f_eval_catch $funcname ln "$LN_SF" "$bootpool_name/boot" \

--- 369 unchanged lines hidden ---