config: fix and improve xml replace

opnsense · Aug 4, 2016 · a2891e8 · a2891e8
1 parent 99da395
commit a2891e8
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/config/16.7/extras.conf b/config/16.7/extras.conf
@@ -1,14 +1,14 @@
 nano_hook()
 {
-	NANO_CONFIG="
+	cat > ${1}/tmp/nano.xml << EOF
     <use_mfs_tmpvar/>
     <enableserial>1</enableserial>
     <serialspeed>${PRODUCT_SPEED}</serialspeed>
     <primaryconsole>serial</primaryconsole>
     <secondaryconsole>vga</secondaryconsole>
-"
-
-	sed -i '' -e "s:</system>:${NANO_CONFIG}</system>:" ${1}${CONFIG_XML}
+EOF
+	sed -i '' -e "/<system>/r ${1}/tmp/nano.xml" ${1}${CONFIG_XML}
+	rm ${1}/tmp/nano.xml
 
 	echo "-S${PRODUCT_SPEED} -D" > ${1}/boot.config
 
@@ -23,13 +23,13 @@ EOF
 
 serial_hook()
 {
-	SERIAL_CONFIG="
+	cat > ${1}/tmp/serial.xml << EOF
     <enableserial>1</enableserial>
     <serialspeed>${PRODUCT_SPEED}</serialspeed>
     <primaryconsole>serial</primaryconsole>
-"
-
-	sed -i '' -e "s:</system>:${SERIAL_CONFIG}</system>:" ${1}${CONFIG_XML}
+EOF
+	sed -i '' -e "/<system>/r ${1}/tmp/serial.xml" ${1}${CONFIG_XML}
+	rm ${1}/tmp/serial.xml
 
 	echo "-S${PRODUCT_SPEED} -D" > ${1}/boot.config