Support local make files.

These additional targets are handy for site-local targets such as
installing the web files or deploying the executable and the man page
on a remote server.

diff --git a/.gitignore b/.gitignore
index 4aafb488c3fc2f1196e67b58c20b7998684a5126..36dfcfa431746cdf6c84f70d1de7e99006f3498a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 Makefile.deps
+Makefile.local
 *.o
 *.swp
 dss.lsg.*

diff --git a/Makefile b/Makefile
index a60a65b3e34e99f643ff4493cfff0c1b8d76a44d..c8242b4f9e3ecc96e3c7da222bf1079a05640d62 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -71,3 +71,5 @@ index.html: dss.1.html index.html.in INSTALL README NEWS
        sed -e '1,/@INSTALL@/d' -e '/@MAN_PAGE@/,$$d' index.html.in >> $@
        cat dss.1.html >> $@
        sed -e '1,/@MAN_PAGE@/d' index.html.in >> $@
+
+-include Makefile.local

diff --git a/dss.c b/dss.c
index 84b6751a70b9d0a20002a30d47155b937118114f..0992ec6fd18651f85c2bab2c7d8d45603b3a786c 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -1122,7 +1122,6 @@ static int change_to_dest_dir(void)
 
 static int check_config(void)
 {
-       int ret;
        uint32_t unit_interval = OPT_UINT32_VAL(DSS, UNIT_INTERVAL);
        uint32_t num_intervals = OPT_UINT32_VAL(DSS, NUM_INTERVALS);
 
@@ -1147,9 +1146,6 @@ static int check_config(void)
                        DSS_ERROR_LOG(("--dest-dir required\n"));
                        return -E_SYNTAX;
                }
-               ret = change_to_dest_dir();
-               if (ret < 0)
-                       return ret;
        }
        DSS_DEBUG_LOG(("number of intervals: %i\n", num_intervals));
        return 1;
@@ -1620,12 +1616,23 @@ static int com_run(void)
                DSS_ERROR_LOG(("pid %d\n", (int)pid));
                return -E_ALREADY_RUNNING;
        }
+       /*
+        * Order is important here: Since daemon_init() forks, it would drop
+        * the lock if it had been acquired already. Changing the cwd before
+        * grabbing the lock causes stat(2) to fail in case a relative config
+        * file path was given, which results in a different key ID for
+        * locking. Therefore we must first daemonize, then lock, then change
+        * the cwd.
+        */
        if (OPT_GIVEN(RUN, DAEMON)) {
                fd = daemon_init();
                daemonized = true;
                logfile = open_log(OPT_STRING_VAL(RUN, LOGFILE));
        }
        lock_dss_or_die();
+       ret = change_to_dest_dir();
+       if (ret < 0)
+               return ret;
        dump_dss_config("startup");
        ret = install_sighandler(SIGHUP);
        if (ret < 0)
@@ -1661,6 +1668,9 @@ static int com_prune(void)
        bool try_hard;
 
        lock_dss_or_die();
+       ret = change_to_dest_dir();
+       if (ret < 0)
+               return ret;
        switch (OPT_UINT32_VAL(PRUNE, DISK_SPACE)) {
        case FDS_LOW: try_hard = true; break;
        case FDS_HIGH: try_hard = false; break;
@@ -1717,6 +1727,9 @@ static int com_create(void)
        char **rsync_argv;
 
        lock_dss_or_die();
+       ret = change_to_dest_dir();
+       if (ret < 0)
+               return ret;
        if (OPT_GIVEN(DSS, DRY_RUN)) {
                int i;
                char *msg = NULL;
@@ -1762,11 +1775,14 @@ EXPORT_CMD_HANDLER(create);
 
 static int com_ls(void)
 {
-       int i;
+       int i, ret;
        struct snapshot_list sl;
        struct snapshot *s;
        int64_t now = get_current_time();
 
+       ret = change_to_dest_dir();
+       if (ret < 0)
+               return ret;
        dss_get_snapshot_list(&sl);
        FOR_EACH_SNAPSHOT(s, i, &sl) {
                int64_t d;