From b9f19641b0eea7b18d83dcbb0d0a9aaebfbe93c1 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 29 Jul 2014 13:30:23 +0000
Subject: [PATCH] base-files: properly escape strings for version info

Make sure they don't break the sed command, and also make device_info
and openwrt_release more robust for parsing by scripts

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41885
---
 base-files/Makefile                  |  4 +++-
 base-files/files/etc/device_info     |  6 +++---
 base-files/files/etc/openwrt_release | 14 +++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/base-files/Makefile b/base-files/Makefile
index 76a4dabe0ed..10724b3eac0 100644
--- a/base-files/Makefile
+++ b/base-files/Makefile
@@ -110,7 +110,9 @@ define Package/base-files/install
 
 	$(VERSION_SED) \
 		$(1)/etc/banner \
-		$(1)/etc/openwrt_version \
+		$(1)/etc/openwrt_version
+
+	$(VERSION_SED_SCRIPT) \
 		$(1)/etc/openwrt_release \
 		$(1)/etc/device_info
 
diff --git a/base-files/files/etc/device_info b/base-files/files/etc/device_info
index da2c4a3b9d7..2962cd7fd5f 100644
--- a/base-files/files/etc/device_info
+++ b/base-files/files/etc/device_info
@@ -1,3 +1,3 @@
-DEVICE_MANUFACTURER="%M"
-DEVICE_PRODUCT="%P"
-DEVICE_REVISION="%h"
+DEVICE_MANUFACTURER='%M'
+DEVICE_PRODUCT='%P'
+DEVICE_REVISION='%h'
diff --git a/base-files/files/etc/openwrt_release b/base-files/files/etc/openwrt_release
index 384386a1fcc..9b2a40c820b 100644
--- a/base-files/files/etc/openwrt_release
+++ b/base-files/files/etc/openwrt_release
@@ -1,7 +1,7 @@
-DISTRIB_ID="%D"
-DISTRIB_RELEASE="%C"
-DISTRIB_REVISION="%R"
-DISTRIB_CODENAME="%n"
-DISTRIB_TARGET="%S"
-DISTRIB_DESCRIPTION="%D %N %V"
-DISTRIB_TAINTS="%t"
+DISTRIB_ID='%D'
+DISTRIB_RELEASE='%C'
+DISTRIB_REVISION='%R'
+DISTRIB_CODENAME='%n'
+DISTRIB_TARGET='%S'
+DISTRIB_DESCRIPTION='%D %N %V'
+DISTRIB_TAINTS='%t'
-- 
GitLab