d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't tell the user to remove the media until its actually possible for

Browse Source 
them to remove the media.  CDs need to be unmounted before they can be
removed.
This commit is contained in:
kensmith 2008-12-15 15:46:56 +00:00
parent f0e837432d
commit dd1f772713
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/sysinstall/main.c
View File

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

9
usr.sbin/sysinstall/system.c
View File

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