dehydrated: Fix various syntax errors

* The backup include file was missing a leading slash
which caused no files to be backed up.

* The shell escaping was broken so a new configuration file
was useless.

Fixes: #12297
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/backup/includes/dehydrated b/config/backup/includes/dehydrated
index b5c64f5efe5adcff4ec18b39908509f1f22bee13..86fdb9b42f84ca26356b180013f826f672c4ceb5 100644 (file)
--- a/config/backup/includes/dehydrated
+++ b/config/backup/includes/dehydrated
@@ -1 +1 @@
-etc/dehydrated
+/etc/dehydrated

diff --git a/lfs/dehydrated b/lfs/dehydrated
index 232588461809705a4f78c6b52131d436aa9ff041..fc82f270d714a83d8154f0ff3a980cc1b20c908d 100644 (file)
--- a/lfs/dehydrated
+++ b/lfs/dehydrated
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dehydrated
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -92,8 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Install example configuration
        cd $(DIR_APP) && sed \
-               -e 's|^#CONFIG_D=|CONFIG_D="\${BASEDIR}/conf.d"|' \
-               -e 's|^#HOOK=|HOOK="\${BASEDIR}/hook.sh"|' \
+               -e 's|^#CONFIG_D=|CONFIG_D="\$${BASEDIR}/conf.d"|' \
+               -e 's|^#HOOK=|HOOK="\$${BASEDIR}/hook.sh"|' \
                docs/examples/config > /etc/dehydrated/config
 
        # Install example hook