webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

dehydrated: Fix various syntax errors

Browse Source 
* 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>
This commit is contained in:
Michael Tremer
2020-02-17 11:59:32 +00:00
committed by Arne Fitzenreiter
parent d875a2b157
commit 31ba6f6fc9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/backup/includes/dehydrated
View File

@@ -1 +1 @@
etc/dehydrated /etc/dehydrated

6
lfs/dehydrated
View File

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