From 08d7abb0769701e3c14053b1b2406147ef9dd021 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sat, 2 Jul 2011 10:18:22 -0400
Subject: base/install: rewrite the config to sanitize it

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
 install/base | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'install')

diff --git a/install/base b/install/base
index 446167c..64ef39a 100644
--- a/install/base
+++ b/install/base
@@ -13,8 +13,21 @@ build() {
     add_file "/lib/initcpio/init" "/init"
     add_file "/etc/modprobe.d/usb-load-ehci-first.conf"
 
-    # private API call is required here
-    _add_file "/config" "$CONFIG" 644
+    # write a new config file. re-source the config as we can't guarantee the
+    # environment hasn't been modified, but subshell it so it doesn't disturb
+    # anyone else.
+    (
+        . "$CONFIG"
+
+        # sanitize of any extra whitespace
+        read -r -a modules <<< "$MODULES"
+        read -r -a hooks <<< "$HOOKS"
+
+        {
+            (( ${#modules[*]} )) && printf 'MODULES="%s"\n' "${modules[*]}"
+            (( ${#hooks[*]} )) && printf 'HOOKS="%s"\n' "${hooks[*]}"
+        } >"$BUILDROOT/config"
+    )
 }
 
 help() {
-- 
cgit v1.2.3-24-g4f1b