svn commit: r313764 - stable/10/usr.sbin/bsdinstall/scripts

[Renato Botelho]

Author: garga (ports committer)
Date: Wed Feb 15 09:15:51 2017
New Revision: 313764
URL: https://svnweb.freebsd.org/changeset/base/313764

Log:
  MFC r313448:
  
  bsdinstall: Make sure chroot filesystems are umounted after use
  
  * DISTDIR_IS_UNIONFS is set every time BSDINSTALL_DISTDIR is mounted inside
    BSDINSTALL_CHROOT. Use this flag to decide if it needs to be umounted
  * BSDINSTALL_CHROOT/dev is mounted when 'bsdinstall mount' is called, there is
    no need to mount it again when user goes to shell after installation
  
  Reviewed by:	allanjude
  Obtained from:	pfSense
  MFC after:	1 week
  Sponsored by:	Rubicon Communications (Netgate)
  Differential Revision:	https://reviews.freebsd.org/D8573

Modified:
  stable/10/usr.sbin/bsdinstall/scripts/auto
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/auto	Wed Feb 15 08:49:28 2017	(r313763)
+++ stable/10/usr.sbin/bsdinstall/scripts/auto	Wed Feb 15 09:15:51 2017	(r313764)
@@ -387,9 +387,11 @@ finalconfig
 trap error SIGINT	# SIGINT is bad again
 bsdinstall config  || error "Failed to save config"
 
+if [ -n "$DISTDIR_IS_UNIONFS" ]; then
+	umount -f $BSDINSTALL_DISTDIR
+fi
+
 if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then
-	[ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \
-	    umount "$BSDINSTALL_DISTDIR"
 	rm -rf "$BSDINSTALL_FETCHDEST"
 fi
 
@@ -398,7 +400,6 @@ dialog --backtitle "FreeBSD Installer" -
    "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0
 if [ $? -eq 0 ]; then
 	clear
-	mount -t devfs devfs "$BSDINSTALL_CHROOT/dev"
 	echo This shell is operating in a chroot in the new system. \
 	    When finished making configuration changes, type \"exit\".
 	chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&1