Browse Source

Merge pull request #74 from lgierth/systemd-genconf

Make systemd config generation more resilient
Lars Gierth 8 years ago
parent
commit
647912275a
1 changed files with 3 additions and 2 deletions
  1. 3 2
      contrib/systemd/cjdns.service

+ 3 - 2
contrib/systemd/cjdns.service

@@ -7,9 +7,10 @@ After=network.target
 ProtectHome=true
 ProtectSystem=true
 SyslogIdentifier=cjdroute
-ExecStartPre=/bin/sh -ec "if ! test -e /etc/cjdroute.conf; \
+ExecStartPre=/bin/sh -ec "if ! test -s /etc/cjdroute.conf; \
                 then umask 077; \
-                /usr/bin/cjdroute --genconf > /etc/cjdroute.conf; \
+                conf=$(cjdroute --genconf); \
+                echo $conf > /etc/cjdroute.conf; \
                 echo 'WARNING: A new /etc/cjdroute.conf file has been generated.'; \
             fi"
 ExecStart=/bin/sh -c "exec cjdroute --nobg < /etc/cjdroute.conf"