View | Details | Raw Unified | Return to bug 229628
Collapse All | Expand All

(-)usr.sbin/bsdinstall/bsdinstall (-1 / +1 lines)
Lines 75-81 Link Here
75 
	"") exec "/usr/libexec/bsdinstall/$VERB" "$@" 2> /dev/null ;;
 75 
	"") exec "/usr/libexec/bsdinstall/$VERB" "$@" 2> /dev/null ;;
76 
	# If begins with `+', send errors to both terminal and file (no `+')
 76 
	# If begins with `+', send errors to both terminal and file (no `+')
77 
	+*) exec "/usr/libexec/bsdinstall/$VERB" "$@" \
 77 
	+*) exec "/usr/libexec/bsdinstall/$VERB" "$@" \
78 
		2>&1 >&$TERMINAL_STDOUT_PASSTHRU | tee "${debugFile#+}" ;;
 78 
		2>&1 >&$TERMINAL_STDOUT_PASSTHRU | tee -a "${debugFile#+}" ;;
79 
	# Otherwise, just send errors to the file specified
 79 
	# Otherwise, just send errors to the file specified
80 
	*) exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>> "$debugFile"
 80 
	*) exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>> "$debugFile"
81 
	esac
 81 
	esac
(-)usr.sbin/bsdinstall/scripts/script (-1 / +1 lines)
Lines 120-126 Link Here
120 
	# set ctime/mtime on the root of FAT partitions. tar has no option to
 120 
	# set ctime/mtime on the root of FAT partitions. tar has no option to
121 
	# ignore this. We probably need to switch back to distextract here
 121 
	# ignore this. We probably need to switch back to distextract here
122 
	# to properly support EFI.
 122 
	# to properly support EFI.
123 
	tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT
 123 
	tar -xPf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT
124 
done
 124 
done
125 

          125
          

        

        

          126
          
# Configure bootloader if needed

          126
          
# Configure bootloader if needed

        



(-)usr.sbin/bsdinstall/scripts/zfsboot
      (+24 lines)




  

    
      
            Lines 186-191
          
      
      
        Link Here
      
    
  

        

          186
          
# Command strings for various tasks

          186
          
# Command strings for various tasks

        

        

          187
          
#

          187
          
#

        

        

          188
          
CHMOD_MODE='chmod %s "%s"'

          188
          
CHMOD_MODE='chmod %s "%s"'

        

            

              
              
              189
              
CP='cp %s %s'

            

        

          189
          
DD_WITH_OPTIONS='dd if="%s" of="%s" %s'

          190
          
DD_WITH_OPTIONS='dd if="%s" of="%s" %s'

        

        

          190
          
ECHO_APPEND='echo "%s" >> "%s"'

          191
          
ECHO_APPEND='echo "%s" >> "%s"'

        

        

          191
          
GELI_ATTACH='geli attach -j - -k "%s" "%s"'

          192
          
GELI_ATTACH='geli attach -j - -k "%s" "%s"'

        

  

    
      
            Lines 1418-1423
          
      
      
        Link Here
      
    
  

        

          1418
          
	             "$zroot_name" || return $FAILURE

          1419
          
	             "$zroot_name" || return $FAILURE

        

        

          1419
          

          1420
          

        

        

          1420
          
	if [ "$ZFSBOOT_BOOT_POOL" ]; then

          1421
          
	if [ "$ZFSBOOT_BOOT_POOL" ]; then

        

            

              
              
              1422
              
		f_eval_catch $funcname zpool "$ZPOOL_SET" \

            

            

              1423
              
	             "cachefile=\"$BSDINSTALL_CHROOT/boot/zfs/zpool.cache\"" \

            

            

              1424
              
	             "$bootpool_name" || return $FAILURE

            

        

          1421
          
		f_eval_catch $funcname printf "$PRINTF_CONF" \

          1425
          
		f_eval_catch $funcname printf "$PRINTF_CONF" \

        

        

          1422
          
			vfs.root.mountfrom "\"zfs:$zroot_name/$zroot_bootfs\"" \

          1426
          
			vfs.root.mountfrom "\"zfs:$zroot_name/$zroot_bootfs\"" \

        

        

          1423
          
			$BSDINSTALL_TMPBOOT/loader.conf.root || return $FAILURE

          1427
          
			$BSDINSTALL_TMPBOOT/loader.conf.root || return $FAILURE

        

  

    
      
            Lines 1456-1461
          
      
      
        Link Here
      
    
  

        

          1456
          
		             return $FAILURE

          1460
          
		             return $FAILURE

        

        

          1457
          
	fi

          1461
          
	fi

        

        

          1458
          

          1462
          

        

            

              
              
              1463
              
	if [ "$ZFSBOOT_BOOT_POOL" ]; then

            

            

              1464
              
		local cachepath="$bootpool/boot/zfs/zpool.cache"

            

            

              1465
              
		local cachedir="$BSDINSTALL_CHROOT/var/cache"

            

            

              1466
              
		local cachefile="$cachedir/zpool.cache"

            

            

              1467
              

            

            

              1468
              
		f_eval_catch $funcname mkdir "$MKDIR_P" $cachedir ||

            

            

              1469
              
		             return $FAILURE

            

            

              1470
              
		f_eval_catch $funcname cp "$CP" $cachepath $cachedir ||

            

            

              1471
              
		             return $FAILURE

            

            

              1472
              
		f_eval_catch $funcname zpool "$ZPOOL_EXPORT" $bootpool_name ||

            

            

              1473
              
		             return $FAILURE

            

            

              1474
              
		f_eval_catch $funcname mkdir "$MKDIR_P" $bootpool/boot/zfs ||

            

            

              1475
              
		             return $FAILURE

            

            

              1476
              
		f_eval_catch $funcname cp "$CP" $cachefile $cachepath ||

            

            

              1477
              
		             return $FAILURE

            

            

              1478
              
		f_eval_catch $funcname zpool "$ZPOOL_IMPORT_WITH_OPTIONS" \

            

            

              1479
              
			     "-o altroot=\"$BSDINSTALL_CHROOT\"" \

            

            

              1480
              
			     $bootpool_name || return $FAILURE

            

            

              1481
              
	fi

            

            

              1482
              

            

        

          1459
          
	# We're all done unless we should go on to do encryption

          1483
          
	# We're all done unless we should go on to do encryption

        

        

          1460
          
	[ "$ZFSBOOT_GELI_ENCRYPTION" ] || return $SUCCESS

          1484
          
	[ "$ZFSBOOT_GELI_ENCRYPTION" ] || return $SUCCESS

        

        

          1461
          

          1485
          

        






  

  Return to bug 229628