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();
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
