summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--doc/todo/etckeeper_with_git_breaks_update-manager_.mdwn2
-rw-r--r--doc/todo/etckeeper_with_git_breaks_update-manager_/comment_2_0324393d5a4f4e6a6174c27f1a53e886._comment10
-rwxr-xr-xetckeeper5
4 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 133618f..aecd60f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ etckeeper (1.18.3) UNRELEASED; urgency=medium
Thanks, Richard Savio
* Added support for Arch's pacman package manager version 5.
Thanks, Tilman Blumenbach.
+ * Set HOME if it's not set, as is the case when using ubuntu's update-manager.
-- Joey Hess <id@joeyh.name> Mon, 21 Sep 2015 16:38:03 -0400
diff --git a/doc/todo/etckeeper_with_git_breaks_update-manager_.mdwn b/doc/todo/etckeeper_with_git_breaks_update-manager_.mdwn
index b74f97c..b2bfe96 100644
--- a/doc/todo/etckeeper_with_git_breaks_update-manager_.mdwn
+++ b/doc/todo/etckeeper_with_git_breaks_update-manager_.mdwn
@@ -28,3 +28,5 @@ But when the update-manger install new packet versions it ends with an "installa
SourcePackage: etckeeper
UpgradeStatus: No upgrade log present (probably fresh install)
mtime.conffile..etc.etckeeper.etckeeper.conf: 2014-03-30T16:33:03.109833
+
+> [[done]] --[[Joey]]
diff --git a/doc/todo/etckeeper_with_git_breaks_update-manager_/comment_2_0324393d5a4f4e6a6174c27f1a53e886._comment b/doc/todo/etckeeper_with_git_breaks_update-manager_/comment_2_0324393d5a4f4e6a6174c27f1a53e886._comment
new file mode 100644
index 0000000..8a25023
--- /dev/null
+++ b/doc/todo/etckeeper_with_git_breaks_update-manager_/comment_2_0324393d5a4f4e6a6174c27f1a53e886._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2016-02-15T17:09:15Z"
+ content="""
+user.email and user.name are set by etckeeper to sane fallback defaults.
+ubuntu has a seriously ancient version of etckeeper, which predates that.
+
+I've added a default for HOME.
+"""]]
diff --git a/etckeeper b/etckeeper
index d85ebb6..5a3ca25 100755
--- a/etckeeper
+++ b/etckeeper
@@ -59,6 +59,11 @@ if [ ! -z "$PUSH_REMOTE" ]; then
export PUSH_REMOTE
fi
+if [ -z "$HOME" ]; then
+ HOME=~root
+ export HOME
+fi
+
if [ -z "$1" ]; then
usage
elif [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ]; then