From aab56c9b801240c02f564c06af37b1a80e5ffe10 Mon Sep 17 00:00:00 2001 From: Gio Date: Wed, 12 Jun 2019 21:12:11 +0200 Subject: [PATCH] babeld delete temporarly generate files ensure temporarly generated config files doesn't linger accross babeld restarts --- babeld/files/babeld.init | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init index a177f68..4f64693 100755 --- a/babeld/files/babeld.init +++ b/babeld/files/babeld.init @@ -8,6 +8,7 @@ START=70 CONFIGFILE='/var/etc/babeld.conf' OTHERCONFIGFILE="/etc/babeld.conf" OTHERCONFIGDIR="/tmp/babeld.d/" +TMPCONFIGDIR="/tmp/babeld_init_d/" EXTRA_COMMANDS="status" EXTRA_HELP=" status Dump Babel's table to the log file." @@ -136,7 +137,7 @@ babel_config_cb() { return } - interfaceFile="${OTHERCONFIGDIR}/interface_$interface.conf" + interfaceFile="${TMPCONFIGDIR}/interface_$interface.conf" if [ "$interface" == "default" ]; then echo "default" > "$interfaceFile" @@ -178,6 +179,8 @@ start_service() { mkdir -p /var/lib mkdir -p /var/etc mkdir -p "$OTHERCONFIGDIR" + rm -rf "$TMPCONFIGDIR" + mkdir -p "$TMPCONFIGDIR" # Start by emptying the generated config file >"$CONFIGFILE" @@ -203,6 +206,12 @@ start_service() { [ -f "$f" ] && cat "$f" >> "$CONFIGFILE" done + # Import temporary config files + for f in "$TMPCONFIGDIR"/*.conf; do + [ -f "$f" ] && cat "$f" >> "$CONFIGFILE" + done + rm -rf "$TMPCONFIGDIR" + procd_open_instance # Using multiple config files is supported since babeld 1.5.1 procd_set_param command /usr/sbin/babeld -I "" -c "$OTHERCONFIGFILE" -c "$CONFIGFILE"