From 11601b4ccdafa6db15b86371c9cbad0fe853236a Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sat, 10 Jun 2006 16:09:59 +0000
Subject: [PATCH] Add fix from anarcat for ${configdirectory} in ninjahelper,
also add -L to find to follow symlinks in case this directory is actually not
a directory, but instead a symlink to somewhere else
---
ChangeLog | 5 ++++-
src/ninjahelper.in | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2edbef9..ac802d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@ version 0.9.4 -- unreleased
from the one in the configuration file (default is root as before).
Thanks to Martin Krafft for the patch (Closes: #370396).
. When determining which backup actions to make, find now follows
- symlinks for /etc/backup.d
+ symlinks for $configdirectory
handler changes
Added tar handler
mysql:
@@ -53,6 +53,9 @@ version 0.9.4 -- unreleased
. found_vservers: escaped special grep repetition character +
ninjahelper changes
. Recursively ignore subdirs in /etc/backup.d (Closes: #361102)
+ . Fix configdirectory error that forced you to use /etc/backup.d, thanks anarcat
+ . When determining which backup actions to list, find now follows
+ symlinks for $configdirectory
changed cron permissions to 644
minor documentation fixes
diff --git a/src/ninjahelper.in b/src/ninjahelper.in
index 3aef3f6..0116461 100755
--- a/src/ninjahelper.in
+++ b/src/ninjahelper.in
@@ -257,7 +257,7 @@ while true; do
menulist=
action=
let "i = 1"
-for file in `find $conf/etc/backup.d/ -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`; do
+for file in `find -L ${configdirectory} -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`; do
menulist="$menulist $i $file"
actions[$i]=$file
let "i += 1"
--
GitLab