Merge commit 'origin/next'

diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files
index 58c19601ee96c50fbd7d20512d3c83dfd54261c4..7b1d4c0e82f983d7650e9c71946be77da01aaba1 100644 (file)
--- a/config/rootfiles/core/56/filelists/files
+++ b/config/rootfiles/core/56/filelists/files
@@ -8,3 +8,4 @@ srv/web/ipfire/cgi-bin/media.cgi
 usr/local/bin/hddshutdown
 usr/local/bin/makegraphs
 usr/local/bin/openvpnctrl
+usr/local/bin/readhash

diff --git a/src/scripts/readhash b/src/scripts/readhash
index 63a3e0f88d8b8ad5227a1a0989df73fa7e9006f2..8c187d51d1bdb7a3a6d282d754ea63a9a62ba35c 100644 (file)
--- a/src/scripts/readhash
+++ b/src/scripts/readhash
@@ -13,7 +13,7 @@ VARNAME='[A-Za-z_][A-zA-z0-9_]*'
 
 # For the assigned value we only accept a limited number of characters - none
 # of which are shell metachars
-VARCHARS='A-Za-z0-9=/,._@#+-'
+VARCHARS='A-Za-z0-9=/,.:_@#+-'
 VARVAL="[${VARCHARS}]*"
 
 sed -ne "s/\(${VARNAME}\)=\(${VARVAL}\)$/\1=\2/p" $1