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

Always shutdown the media when we're exiting the packages module (prevents

Browse Source 
errors on re-entry for physical media). Also, while we're here, stop
ejecting the CDROM when we're done with it (but leave the functions for
later use so that we could perhaps -- from the installer standpoint -- use
it to eject the media after an install).

MFC after:	3 days
This commit is contained in:
dteske 2013-11-17 17:48:55 +00:00
parent f5e406a2b5
commit 358285463c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/bsdconfig/packages/packages
View File

@ -38,6 +38,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
. $BSDCFG_SHARE/common.subr || exit 1
f_dprintf "%s: loading includes..." "$0"
f_include $BSDCFG_SHARE/dialog.subr
f_include $BSDCFG_SHARE/media/common.subr
f_include $BSDCFG_SHARE/mustberoot.subr
f_include $BSDCFG_SHARE/packages/packages.subr
@ -73,6 +74,7 @@ f_device_get_all
#
# Display the package configuration menu and exit
#
trap 'f_media_close' EXIT
f_package_config
################################################################################

5
usr.sbin/bsdconfig/share/media/cdrom.subr
View File

@ -163,8 +163,7 @@ f_media_get_cdrom()
# f_media_shutdown_cdrom $device
#
# Shuts down the CDROM device and ejects the media using f_media_eject_cdrom(),
# below. Return status should be ignored.
# Shuts down the CDROM device. Return status should be ignored.
#
f_media_shutdown_cdrom()
{
@ -184,8 +183,6 @@ f_media_shutdown_cdrom()
else
CDROM_MOUNTED=
fi
f_media_eject_cdrom "$dev"
}
# f_media_eject_cdrom $device