From owner-svn-src-all@FreeBSD.ORG  Mon Dec 15 15:46:56 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B9DE31065676;
	Mon, 15 Dec 2008 15:46:56 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A3FAC8FC28;
	Mon, 15 Dec 2008 15:46:56 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBFFkugd099318;
	Mon, 15 Dec 2008 15:46:56 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBFFku3j099316;
	Mon, 15 Dec 2008 15:46:56 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <200812151546.mBFFku3j099316@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Mon, 15 Dec 2008 15:46:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186131 - head/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Dec 2008 15:46:56 -0000

Author: kensmith
Date: Mon Dec 15 15:46:56 2008
New Revision: 186131
URL: http://svn.freebsd.org/changeset/base/186131

Log:
  Don't tell the user to remove the media until its actually possible for
  them to remove the media.  CDs need to be unmounted before they can be
  removed.

Modified:
  head/usr.sbin/sysinstall/main.c
  head/usr.sbin/sysinstall/system.c

Modified: head/usr.sbin/sysinstall/main.c
==============================================================================
--- head/usr.sbin/sysinstall/main.c	Mon Dec 15 15:42:24 2008	(r186130)
+++ head/usr.sbin/sysinstall/main.c	Mon Dec 15 15:46:56 2008	(r186131)
@@ -201,8 +201,7 @@ main(int argc, char **argv)
 #if defined(__sparc64__)
 	    || !msgNoYes("Are you sure you wish to exit?  The system will halt.")
 #else
-	    || !msgNoYes("Are you sure you wish to exit?  The system will reboot\n"
-		         "(be sure to remove any floppies/CDs/DVDs from the drives).")
+	    || !msgNoYes("Are you sure you wish to exit?  The system will reboot.")
 #endif
 	    )
 	    break;

Modified: head/usr.sbin/sysinstall/system.c
==============================================================================
--- head/usr.sbin/sysinstall/system.c	Mon Dec 15 15:42:24 2008	(r186130)
+++ head/usr.sbin/sysinstall/system.c	Mon Dec 15 15:46:56 2008	(r186131)
@@ -235,8 +235,13 @@ void
 systemShutdown(int status)
 {
     /* If some media is open, close it down */
-    if (status >=0)
-	mediaClose();
+    if (status >=0) {
+	if (mediaDevice != NULL && mediaDevice->type == DEVICE_TYPE_CDROM) {
+	    mediaClose();
+	    msgConfirm("Be sure to remove the media from the drive.");
+	} else
+	    mediaClose();
+    }
 
     /* write out any changes to rc.conf .. */
     configRC_conf();