From 9b4d973cc3bb5ddee00b1c20ef5f1edec8f9ac3a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 5 Nov 2007 23:45:43 -0500
Subject: renumber

---
 init.d/05restore-etckeeper   |  8 --------
 init.d/10restore-etckeeper   |  8 ++++++++
 init.d/10restore-metadata    | 10 ----------
 init.d/20git-init            |  6 ------
 init.d/20restore-metadata    | 10 ++++++++++
 init.d/30git-perm            |  3 ---
 init.d/40git-ignore          | 14 --------------
 init.d/40git-init            |  6 ++++++
 init.d/40git-pre-commit-hook | 15 ---------------
 init.d/50git-add             |  5 -----
 init.d/50git-ignore          | 14 ++++++++++++++
 init.d/50git-perm            |  3 +++
 init.d/50git-pre-commit-hook | 15 +++++++++++++++
 init.d/70git-add             |  5 +++++
 14 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100755 init.d/05restore-etckeeper
 create mode 100755 init.d/10restore-etckeeper
 delete mode 100755 init.d/10restore-metadata
 delete mode 100755 init.d/20git-init
 create mode 100755 init.d/20restore-metadata
 delete mode 100755 init.d/30git-perm
 delete mode 100755 init.d/40git-ignore
 create mode 100755 init.d/40git-init
 delete mode 100755 init.d/40git-pre-commit-hook
 delete mode 100755 init.d/50git-add
 create mode 100755 init.d/50git-ignore
 create mode 100755 init.d/50git-perm
 create mode 100755 init.d/50git-pre-commit-hook
 create mode 100755 init.d/70git-add

(limited to 'init.d')

diff --git a/init.d/05restore-etckeeper b/init.d/05restore-etckeeper
deleted file mode 100755
index 376524c..0000000
--- a/init.d/05restore-etckeeper
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-# Yes, this runs code from the repository. As documented, etckeeper-init
-# should only be run on repositories you trust.
-if [ -e .etckeeper ]; then
-	. ./.etckeeper
-fi
diff --git a/init.d/10restore-etckeeper b/init.d/10restore-etckeeper
new file mode 100755
index 0000000..376524c
--- /dev/null
+++ b/init.d/10restore-etckeeper
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+# Yes, this runs code from the repository. As documented, etckeeper-init
+# should only be run on repositories you trust.
+if [ -e .etckeeper ]; then
+	. ./.etckeeper
+fi
diff --git a/init.d/10restore-metadata b/init.d/10restore-metadata
deleted file mode 100755
index cd6174c..0000000
--- a/init.d/10restore-metadata
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-# Note that metastore doesn't check that the .metastore file only changes
-# perms of files in the current directory. It's ok to trust the .metastore
-# file won't do anything shady, because, as documented, etckeeper-init
-# should only be run on repositories you trust.
-if [ -e .metadata ]; then
-	metastore --apply
-fi
diff --git a/init.d/20git-init b/init.d/20git-init
deleted file mode 100755
index 69867c4..0000000
--- a/init.d/20git-init
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-if [ ! -e .git ]; then
-	git-init
-	echo "$(hostname) /etc repository" > .git/description
-fi
diff --git a/init.d/20restore-metadata b/init.d/20restore-metadata
new file mode 100755
index 0000000..cd6174c
--- /dev/null
+++ b/init.d/20restore-metadata
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# Note that metastore doesn't check that the .metastore file only changes
+# perms of files in the current directory. It's ok to trust the .metastore
+# file won't do anything shady, because, as documented, etckeeper-init
+# should only be run on repositories you trust.
+if [ -e .metadata ]; then
+	metastore --apply
+fi
diff --git a/init.d/30git-perm b/init.d/30git-perm
deleted file mode 100755
index 564e489..0000000
--- a/init.d/30git-perm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-chmod 700 .git
diff --git a/init.d/40git-ignore b/init.d/40git-ignore
deleted file mode 100755
index 88866cf..0000000
--- a/init.d/40git-ignore
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-if [ ! -e .gitignore ]; then
-	cat >.gitignore <<EOF
-*~
-
-# new and old versions of conffiles, stored by dpkg
-*.dpkg-*
-
-# mount(8) records system state here, no need to keep these in git
-blkid.tab(|.old)
-mtab
-EOF
-fi
diff --git a/init.d/40git-init b/init.d/40git-init
new file mode 100755
index 0000000..69867c4
--- /dev/null
+++ b/init.d/40git-init
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+if [ ! -e .git ]; then
+	git-init
+	echo "$(hostname) /etc repository" > .git/description
+fi
diff --git a/init.d/40git-pre-commit-hook b/init.d/40git-pre-commit-hook
deleted file mode 100755
index 0efd5e4..0000000
--- a/init.d/40git-pre-commit-hook
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -e
-if [ -x .git/hooks/pre-commit ]; then
-	if ! grep -q "etckeeper pre-commit" .git/hooks/pre-commit; then
-		echo "etckeeper warning: .git/hooks/pre-commit needs to be manually modifed to run: etckeeper pre-commit `pwd`" >&2
-	fi
-else
-	cat >.git/hooks/pre-commit <<EOF
-#!/bin/sh
-# pre-commit hook for etckeeper, to store metadata and do sanity checks
-set -e
-etckeeper pre-commit `pwd`
-EOF
-	chmod +x .git/hooks/pre-commit
-fi
diff --git a/init.d/50git-add b/init.d/50git-add
deleted file mode 100755
index 06504b4..0000000
--- a/init.d/50git-add
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-if ! git-add .; then
-	echo "etckeeper warning: git-add failed" >&2
-fi
diff --git a/init.d/50git-ignore b/init.d/50git-ignore
new file mode 100755
index 0000000..88866cf
--- /dev/null
+++ b/init.d/50git-ignore
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+if [ ! -e .gitignore ]; then
+	cat >.gitignore <<EOF
+*~
+
+# new and old versions of conffiles, stored by dpkg
+*.dpkg-*
+
+# mount(8) records system state here, no need to keep these in git
+blkid.tab(|.old)
+mtab
+EOF
+fi
diff --git a/init.d/50git-perm b/init.d/50git-perm
new file mode 100755
index 0000000..564e489
--- /dev/null
+++ b/init.d/50git-perm
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+chmod 700 .git
diff --git a/init.d/50git-pre-commit-hook b/init.d/50git-pre-commit-hook
new file mode 100755
index 0000000..0efd5e4
--- /dev/null
+++ b/init.d/50git-pre-commit-hook
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+if [ -x .git/hooks/pre-commit ]; then
+	if ! grep -q "etckeeper pre-commit" .git/hooks/pre-commit; then
+		echo "etckeeper warning: .git/hooks/pre-commit needs to be manually modifed to run: etckeeper pre-commit `pwd`" >&2
+	fi
+else
+	cat >.git/hooks/pre-commit <<EOF
+#!/bin/sh
+# pre-commit hook for etckeeper, to store metadata and do sanity checks
+set -e
+etckeeper pre-commit `pwd`
+EOF
+	chmod +x .git/hooks/pre-commit
+fi
diff --git a/init.d/70git-add b/init.d/70git-add
new file mode 100755
index 0000000..06504b4
--- /dev/null
+++ b/init.d/70git-add
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+if ! git-add .; then
+	echo "etckeeper warning: git-add failed" >&2
+fi
-- 
cgit v1.2.3