From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] dehydrated: Fix various syntax errors
Date: Mon, 17 Feb 2020 11:59:32 +0000
Message-ID: <20200217115932.15000-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4344456440033471862=="
List-Id: <development.lists.ipfire.org>

--===============4344456440033471862==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

* 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(a)ipfire.org>
---
 config/backup/includes/dehydrated | 2 +-
 lfs/dehydrated                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/backup/includes/dehydrated b/config/backup/includes/dehyd=
rated
index b5c64f5ef..86fdb9b42 100644
--- 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 232588461..fc82f270d 100644
--- a/lfs/dehydrated
+++ b/lfs/dehydrated
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D dehydrated
-PAK_VER    =3D 2
+PAK_VER    =3D 3
=20
 DEPS       =3D ""
=20
@@ -92,8 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
=20
 	# Install example configuration
 	cd $(DIR_APP) && sed \
-		-e 's|^#CONFIG_D=3D|CONFIG_D=3D"\${BASEDIR}/conf.d"|' \
-		-e 's|^#HOOK=3D|HOOK=3D"\${BASEDIR}/hook.sh"|' \
+		-e 's|^#CONFIG_D=3D|CONFIG_D=3D"\$${BASEDIR}/conf.d"|' \
+		-e 's|^#HOOK=3D|HOOK=3D"\$${BASEDIR}/hook.sh"|' \
 		docs/examples/config > /etc/dehydrated/config
=20
 	# Install example hook
--=20
2.20.1


--===============4344456440033471862==--