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.
This commit is contained in:
Ken Smith 2008-12-15 15:46:56 +00:00
parent 94b4a038a1
commit 5695960913
2 changed files with 8 additions and 4 deletions
usr.sbin/sysinstall

@ -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;

@ -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();