rootfs: improve verification of downloaded dot-config

Try to source in the subshell downloaded dot-config. This test can detect problems like unterminated quoted string: /bin/sh: /tmp/dot-config: line 59: syntax error: unterminated quoted string Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

rootfs: improve verification of downloaded dot-config
Try to source in the subshell downloaded dot-config. This test can detect problems like unterminated quoted string: /bin/sh: /tmp/dot-config: line 59: syntax error: unterminated quoted string Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
a09620c7 · Adam Wujek · 80663297 · a09620c7
Commit a09620c7 authored Jun 02, 2016 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

dot-config userspace/rootfs_override/etc/init.d/dot-config +4 -2

No files found.
--- a/userspace/rootfs_override/etc/init.d/dot-config
+++ b/userspace/rootfs_override/etc/init.d/dot-config
@@ -107,9 +107,11 @@ if [ "$CONFIG_DOTCONF_SOURCE_REMOTE" = "y" ] || [ "$CONFIG_DOTCONF_SOURCE_TRY_DH
 	    ;;
    esac
    if [ -f $tmpconfig ]; then
-	# If it exists, it is not empty or too small, and the checker is happy
+	# If it exists, it is not empty or too small and the checker is happy
+	# then try to source it in another shell to verify syntax
 	if [ $(cat $tmpconfig | wc -c) -gt 200 ] &&
-	    /wr/bin/wrs_checkcfg $tmpconfig /wr/etc/Kconfig; then
+	    /wr/bin/wrs_checkcfg $tmpconfig /wr/etc/Kconfig &&
+	    /bin/sh -c "source $tmpconfig"; then
 	    echo "Using newly-downloaded dot-config from $URL" >& 2
 	    # copy it in place to use the new file (unless it is identical)
 	    cmp -s $tmpconfig $dotconfig || cp $tmpconfig $dotconfig