diff options
| author | Joey Hess <joey@kitenet.net> | 2010-11-16 14:15:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-16 14:15:01 -0400 |
| commit | d65203b1bf9c1889a47090113a98833f849ae94e (patch) | |
| tree | a896e739454a09b867858fa278a55973b8fb24d1 /debian | |
| parent | 619e220a665f62a355bc895fd978b81018d96570 (diff) | |
Move etckeeper out of sbin, to avoid needing to work around broken root PATH settings in eg, crontab. Closes: #602438
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/cron.daily | 2 | ||||
| -rw-r--r-- | debian/prerm | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index d27988e..432ad79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ etckeeper (0.51) UNRELEASED; urgency=low * Updated Vietnamese translation of debconf templates. Closes: #601921 * Improve rpm version change detection. + * Move etckeeper out of sbin, to avoid needing to work around broken + root PATH settings in eg, crontab. Closes: #602438 -- Joey Hess <joeyh@debian.org> Sat, 30 Oct 2010 23:53:51 -0400 diff --git a/debian/cron.daily b/debian/cron.daily index e83b570..91e2ed4 100644 --- a/debian/cron.daily +++ b/debian/cron.daily @@ -1,6 +1,6 @@ #!/bin/sh set -e -if [ -x /usr/sbin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then +if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then . /etc/etckeeper/etckeeper.conf if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then # avoid autocommit if an install run is in progress diff --git a/debian/prerm b/debian/prerm index 806053a..e13f086 100644 --- a/debian/prerm +++ b/debian/prerm @@ -13,7 +13,7 @@ if [ "$1" = remove ]; then if [ -d /etc/etckeeper/uninit.d ]; then cp -a /etc/etckeeper/uninit.d /var/cache/etckeeper/stash fi - if [ -x /usr/sbin/etckeeper ]; then - cp -a /usr/sbin/etckeeper /var/cache/etckeeper/stash + if [ -x /usr/bin/etckeeper ]; then + cp -a /usr/bin/etckeeper /var/cache/etckeeper/stash fi fi |