Look for config.xml on / of recovery media as well

1 files changed, 10 insertions, 3 deletions

diff --git a/usr.sbin/bsdinstall/scripts/copy_configxml_from_usb b/usr.sbin/bsdinstall/scripts/copy_configxml_from_usb
index d682311..9866b13 100755
--- a/usr.sbin/bsdinstall/scripts/copy_configxml_from_usb
+++ b/usr.sbin/bsdinstall/scripts/copy_configxml_from_usb
@@ -30,6 +30,8 @@ recovery_dir=/tmp/recovered_config
 mkdir -p ${recovery_mount}
 mkdir -p ${recovery_dir}
 
+CONFIG_XML_PATH=""
+
 look_for_config_xml_config_msdos() {
 	mkdir -p ${recovery_mount}
 	echo -n "Looking for config.xml on "
@@ -43,6 +45,11 @@ look_for_config_xml_config_msdos() {
 			# look for config.xml
 			if [ -r ${recovery_mount}/conf/config.xml  ]; then
 				echo -n "[config.xml on ${try_device}] "
+				CONFIG_XML_PATH="${recovery_mount}/conf/config.xml"
+				return 0
+			elif [ -r ${recovery_mount}/config.xml  ]; then
+				echo -n "[config.xml on ${try_device}] "
+				CONFIG_XML_PATH="${recovery_mount}/config.xml"
 				return 0
 			else
 				echo -n "[no config.xml on ${try_device}, unmounting] "
@@ -54,11 +61,11 @@ look_for_config_xml_config_msdos() {
 }
 
 # Try to locate an existing config.xml file
-if look_for_config_xml_config_msdos ; then
-	/bin/cp -r ${recovery_mount}/conf/config.xml ${recovery_dir}
+if look_for_config_xml_config_msdos; then
+	/bin/cp -r ${CONFIG_XML_PATH} ${recovery_dir}
 	/sbin/umount ${recovery_mount} 2>&1
 	echo -n "[Copied config.xml file to recovery area] "
 else
 	echo -n "[Could not locate an existing config.xml file!] "
 fi
-echo "Done."
\ No newline at end of file
+echo "Done."