diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-08-25 19:05:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-08-25 19:05:25 -0400 |
| commit | 4df36434f50be58f413550dd36206f0c15a3e6f2 (patch) | |
| tree | 7ee7c8396afca9bb6e718df9dc0c5ab54e4b4224 | |
| parent | 76509711941c94a8f16153ec7f367360ffea6676 (diff) | |
Attic: Fix broken shell escaping in attic cron job.
Didn't see this one fail, or test this, but it had exactly the same code as
borg.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | src/Propellor/Property/Attic.hs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4e8c66b8..c7cfb81a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ propellor (4.8.0) UNRELEASED; urgency=medium Instead, use VirtualBoxPointer in the property that creates the disk image. * Borg: Fix broken shell escaping in borg cron job. + * Attic: Fix broken shell escaping in attic cron job. -- Joey Hess <id@joeyh.name> Thu, 24 Aug 2017 11:00:19 -0400 diff --git a/src/Propellor/Property/Attic.hs b/src/Propellor/Property/Attic.hs index 9e024356..8ab5546b 100644 --- a/src/Propellor/Property/Attic.hs +++ b/src/Propellor/Property/Attic.hs @@ -108,7 +108,7 @@ backup' dir backupdir crontimes extraargs kp = cronjob where desc = backupdir ++ " attic backup" cronjob = Cron.niceJob ("attic_backup" ++ dir) crontimes (User "root") "/" $ - "flock " ++ shellEscape lockfile ++ " sh -c " ++ backupcmd + "flock " ++ shellEscape lockfile ++ " sh -c " ++ shellEscape backupcmd lockfile = "/var/lock/propellor-attic.lock" backupcmd = intercalate ";" $ createCommand |