summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-07-08 18:49:13 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-07-08 18:49:13 -0400
commit7d7ffaef3f628af20278c37513819f2456d7b49f (patch)
tree7c8a3dd06edcb074f2748b3780a04d9b3ccca593
parent89ed68beacbeb2eebe583f0818af0c1abb23f3f5 (diff)
rename
-rwxr-xr-x50pristine-etc-keeper.post-install6
-rwxr-xr-xpristine-etc-keeper7
-rw-r--r--pristine-etc-keeper.service5
-rw-r--r--pristine-etc-keeper.timer5
4 files changed, 10 insertions, 13 deletions
diff --git a/50pristine-etc-keeper.post-install b/50pristine-etc-keeper.post-install
index 155ebe8..5031ec3 100755
--- a/50pristine-etc-keeper.post-install
+++ b/50pristine-etc-keeper.post-install
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright 2016 Luke Shumaker
-# see /etc/etckeepr/clean-etc
+# see /etc/etckeeper/pristine-etc-keeper
-systemctl reset-failed clean-etc.service &>/dev/null || true
-systemctl start clean-etc.service
+systemctl reset-failed pristine-etc-keeper.service &>/dev/null || true
+systemctl start pristine-etc-keeper.service
diff --git a/pristine-etc-keeper b/pristine-etc-keeper
index 6d29052..68798e2 100755
--- a/pristine-etc-keeper
+++ b/pristine-etc-keeper
@@ -3,11 +3,10 @@
#
# This script gets called by the etckeeper post-install hook.
-
-# TODO: this script does not handle creating /var/lib/clean-etc; it
+# TODO: this script does not handle creating /var/lib/pristine-etc; it
# assumes that it already exists. Especially note setting up .git/hooks/pre-commit
-cd /var/lib/clean-etc
+cd /var/lib/pristine-etc
umask 0022
@@ -29,7 +28,7 @@ touch etc/.gitignore
mv -T etc.git etc/.git
cd etc/
if etckeeper unclean -d "$PWD"; then
- etckeeper commit -d "$PWD" 'clean commit'
+ etckeeper commit -d "$PWD" 'pristine commit'
fi
cd /etc
diff --git a/pristine-etc-keeper.service b/pristine-etc-keeper.service
index 2c1c574..f4f57e5 100644
--- a/pristine-etc-keeper.service
+++ b/pristine-etc-keeper.service
@@ -1,7 +1,6 @@
# Copyright 2016 Luke Shumaker
-# see /etc/etckeepr/clean-etc
[Unit]
-Description=etckeeper clean-etc helper
+Description=Autocommit of changes in pristine /etc directory
[Service]
-ExecStart=/etc/etckeeper/clean-etc
+ExecStart=/etc/etckeeper/pristine-etc-keeper
diff --git a/pristine-etc-keeper.timer b/pristine-etc-keeper.timer
index 8aef388..1ee6b11 100644
--- a/pristine-etc-keeper.timer
+++ b/pristine-etc-keeper.timer
@@ -1,8 +1,7 @@
# Copyright 2016 Luke Shumaker
-# see /etc/etckeepr/clean-etc
[Unit]
-Description=Weekly autocommit of pacman /etc changes
-Documentation=man:etckeeper(8)
+Description=Weekly autocommit of changes in pristine /etc directory
+Documentation=man:pristine-etc-keeper(8)
[Timer]
OnBootSec=1d