From 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 17 Feb 2020 11:59:32 +0000 Subject: [PATCH] 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 Signed-off-by: Arne Fitzenreiter --- 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/dehydrated index b5c64f5efe..86fdb9b42f 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 2325884618..fc82f270d7 100644 --- 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 -- 2.39.5