From b8e9ed27c42a49bf2d524ae7dce1e03a206156dc Mon Sep 17 00:00:00 2001 From: Scott Bronson Date: Thu, 20 Mar 2008 03:06:05 -0700 Subject: restore-etckeeper should run after restore-metadata so its settings will take priority. --- init.d/10restore-etckeeper | 11 ----------- init.d/10restore-metadata | 14 ++++++++++++++ init.d/20restore-etckeeper | 11 +++++++++++ init.d/20restore-metadata | 14 -------------- 4 files changed, 25 insertions(+), 25 deletions(-) delete mode 100755 init.d/10restore-etckeeper create mode 100755 init.d/10restore-metadata create mode 100755 init.d/20restore-etckeeper delete mode 100755 init.d/20restore-metadata diff --git a/init.d/10restore-etckeeper b/init.d/10restore-etckeeper deleted file mode 100755 index 984d521..0000000 --- a/init.d/10restore-etckeeper +++ /dev/null @@ -1,11 +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 -else - touch .etckeeper - chmod 600 .etckeeper -fi diff --git a/init.d/10restore-metadata b/init.d/10restore-metadata new file mode 100755 index 0000000..9c2bf65 --- /dev/null +++ b/init.d/10restore-metadata @@ -0,0 +1,14 @@ +#!/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 + if which metastore >/dev/null; then + metastore --apply --mtime + else + echo "etckeeper warning: legacy .metastore file is present but metastore is not installed" >&2 + fi +fi diff --git a/init.d/20restore-etckeeper b/init.d/20restore-etckeeper new file mode 100755 index 0000000..984d521 --- /dev/null +++ b/init.d/20restore-etckeeper @@ -0,0 +1,11 @@ +#!/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 +else + touch .etckeeper + chmod 600 .etckeeper +fi diff --git a/init.d/20restore-metadata b/init.d/20restore-metadata deleted file mode 100755 index 9c2bf65..0000000 --- a/init.d/20restore-metadata +++ /dev/null @@ -1,14 +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 - if which metastore >/dev/null; then - metastore --apply --mtime - else - echo "etckeeper warning: legacy .metastore file is present but metastore is not installed" >&2 - fi -fi -- cgit v1.2.3