summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Jones <sjones@netgate.com>2018-06-22 11:55:28 -0500
committerRenato Botelho <renato@netgate.com>2018-11-12 15:53:43 -0200
commitbcb678a58a7bdf6d7096c939f742f2c4fbdb5810 (patch)
treee7c2d54d2c98ba38e1954ba911fdcf426b7d158b
parent5dbd4cb561a202d8a486af7282c30ed3601dc763 (diff)
downloadFreeBSD-src-bcb678a58a7bdf6d7096c939f742f2c4fbdb5810.zip
FreeBSD-src-bcb678a58a7bdf6d7096c939f742f2c4fbdb5810.tar.gz
Fixed #7634 Remove rrddata from usb backup config during PFI.
config with rrddata takes up a lot of space and does not work when backed up from a USB. This data will now be removed when restoring a config from usb during install.
-rwxr-xr-xusr.sbin/bsdinstall/scripts/copy_configxml_from_usb2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr.sbin/bsdinstall/scripts/copy_configxml_from_usb b/usr.sbin/bsdinstall/scripts/copy_configxml_from_usb
index 9866b13..707c98e 100755
--- a/usr.sbin/bsdinstall/scripts/copy_configxml_from_usb
+++ b/usr.sbin/bsdinstall/scripts/copy_configxml_from_usb
@@ -63,6 +63,8 @@ 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 ${CONFIG_XML_PATH} ${recovery_dir}
+ # Remove rrddata if it is present
+ sed -i '' -e '/<rrddata>/,/<\/rrddata>/ d' ${recovery_dir}/config.xml
/sbin/umount ${recovery_mount} 2>&1
echo -n "[Copied config.xml file to recovery area] "
else
OpenPOWER on IntegriCloud