summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-24 20:59:12 +0000
committerRaphaƫl Hertzog <raphael@offensive-security.com>2020-04-22 18:36:47 +0200
commitd5d1e35f22c5f161442326fe5f5351abe498a3b1 (patch)
tree8943edfefd8ee4f7a9e62d10d98eee1fc772e932 /scripts
parentbbeed4cb60cf8ad697b1d4278fcc75024d1150b2 (diff)
downloadvyos-live-build-d5d1e35f22c5f161442326fe5f5351abe498a3b1.tar.gz
vyos-live-build-d5d1e35f22c5f161442326fe5f5351abe498a3b1.zip
grub2|loopback: remove unnecessary perl based newline escaping for sed
none of the stuff changed here is multi-line so had no reason to use it. Gbp-Dch: Short
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/binary_loopback_cfg24
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg
index 51ef82fd7..9c84e2b18 100755
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@@ -281,18 +281,18 @@ sed -i \
-e "s|LINUX_ADVANCED_INSTALL|$(escape_for_sed "${LINUX_ADVANCED_INSTALL}")|" \
-e "s|LINUX_INSTALL|$(escape_for_sed "${LINUX_INSTALL}")|" \
-e "s|MEMTEST|$(escape_for_sed "${MEMTEST}")|" \
- -e "s|KERNEL_GI|$(escape_for_sed "${KERNEL_GI}")|" \
- -e "s|INITRD_GI|$(escape_for_sed "${INITRD_GI}")|" \
- -e "s|APPEND_GI|$(escape_for_sed "${APPEND_GI}")|" \
- -e "s|KERNEL_DI|$(escape_for_sed "${KERNEL_DI}")|" \
- -e "s|INITRD_DI|$(escape_for_sed "${INITRD_DI}")|" \
- -e "s|APPEND_DI|$(escape_for_sed "${APPEND_DI}")|" \
- -e "s|KERNEL_LIVE|$(escape_for_sed "${KERNEL_LIVE}")|" \
- -e "s|INITRD_LIVE|$(escape_for_sed "${INITRD_LIVE}")|" \
- -e "s|APPEND_LIVE|$(escape_for_sed "${APPEND_LIVE}")|" \
- -e "s|LB_BOOTAPPEND_INSTALL|$(escape_for_sed "${LB_BOOTAPPEND_INSTALL}")|" \
- -e "s|LB_BOOTAPPEND_LIVE_FAILSAFE|$(escape_for_sed "${LB_BOOTAPPEND_LIVE_FAILSAFE}")|" \
- -e "s|LB_BOOTAPPEND_LIVE|$(escape_for_sed "${LB_BOOTAPPEND_LIVE}")|" \
+ -e "s|KERNEL_GI|${KERNEL_GI}|" \
+ -e "s|INITRD_GI|${INITRD_GI}|" \
+ -e "s|APPEND_GI|${APPEND_GI}|" \
+ -e "s|KERNEL_DI|${KERNEL_DI}|" \
+ -e "s|INITRD_DI|${INITRD_DI}|" \
+ -e "s|APPEND_DI|${APPEND_DI}|" \
+ -e "s|KERNEL_LIVE|${KERNEL_LIVE}|" \
+ -e "s|INITRD_LIVE|${INITRD_LIVE}|" \
+ -e "s|APPEND_LIVE|${APPEND_LIVE}|" \
+ -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" \
+ -e "s|LB_BOOTAPPEND_LIVE_FAILSAFE|${LB_BOOTAPPEND_LIVE_FAILSAFE}|" \
+ -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" \
binary/boot/grub/*.cfg
sed -i -e 's|//|/|g' binary/boot/grub/*.cfg