Patch to check for a cd in the drive before defaulting to cd.
Doesn't quite get me another enter during install/upgrade, but I don't know how
to distinguish between install.* and the other media that don't have the sets.
Index: src/distrib/miniroot/install.sub
===================================================================
RCS file: /cvs/src/distrib/miniroot/install.sub,v
retrieving revision 1.809
diff -u -p -u -r1.809 install.sub
--- src/distrib/miniroot/install.sub 12 Jan 2015 16:33:31 -0000 1.809
+++ src/distrib/miniroot/install.sub 29 Jan 2015 18:44:00 -0000
@@ -1605,7 +1605,9 @@ install_sets() {
_d=$CGI_METHOD
ifconfig netboot >/dev/null 2>&1 && : ${_d:=http}
- [[ -n $(get_cddevs) ]] && { _locs="cd $_locs"; : ${_d:=cd}; }
+ [[ -n $(get_cddevs) ]] && { _locs="cd $_locs"; for _cd in
"$(get_cddevs)"; do
+ disklabel -n "${_cd}" >/dev/null 2>1 && : ${_d:=cd} && break;
+ done; }
[[ -x /sbin/mount_nfs ]] && _locs="$_locs nfs"
: ${_d:=http}
-Matthew Martin
