diff options
| -rw-r--r-- | usr.sbin/sysinstall/main.c | 3 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/system.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c index 292038018214..36e8f686531c 100644 --- a/usr.sbin/sysinstall/main.c +++ b/usr.sbin/sysinstall/main.c @@ -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; diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index 4ee6e4f9491a..19307d5bbf9f 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -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(); |