diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2014-10-04 16:51:26 +0400 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-10-04 20:31:50 +0400 |
commit | 604e7b423366f41c820989ff7b2e7b7323861406 (patch) | |
tree | 7706817b8b342689cd2ff87a405f525964dcdbcc | |
parent | 79173a2fa8e4896dce571edb97a381f51d597b56 (diff) |
removed references to /var/lib/mdadm and cleaned up scripts a bit
-rw-r--r-- | debian/initramfs/hook | 25 | ||||
-rw-r--r-- | debian/mdadm.config | 1 | ||||
-rw-r--r-- | debian/mdadm.dirs | 1 | ||||
-rw-r--r-- | debian/mdadm.postinst | 5 | ||||
-rw-r--r-- | debian/mdadm.postrm | 10 | ||||
-rw-r--r-- | debian/mkconf.in | 15 |
6 files changed, 14 insertions, 43 deletions
diff --git a/debian/initramfs/hook b/debian/initramfs/hook index 7a875f6e..85bad65e 100644 --- a/debian/initramfs/hook +++ b/debian/initramfs/hook @@ -110,28 +110,18 @@ if [ ! -f $CONFIG ]; then else - use_temp=0 - if [ -e /var/lib/mdadm/CONF-UNCHECKED ]; then - # the file comes from an old installation and hence is not guaranteed to - # work. We thus better create one and start all arrays to be sure. + if grep -q '^ARRAY' $CONFIG; then - warn "unchecked configuration file: $CONFIG" - - use_temp=1 - elif ! grep -q '^ARRAY' $CONFIG; then - # the file defines no ARRAYs. We better create a temporary file to be - # sure. - - warn "$CONFIG defines no arrays." - use_temp=1 - - else # this is the ideal case install_config $CONFIG $DESTMDADMCONF info "using configuration file: $CONFIG" - fi - if [ $use_temp -eq 1 ]; then + else + + # the file defines no ARRAYs. We better create a temporary file to be sure. + + warn "$CONFIG defines no arrays." + mkdir --parents ${DESTMDADMCONF%/*} tmpfile="${DESTMDADMCONF}.tmp" if /usr/share/mdadm/mkconf > $tmpfile; then @@ -149,6 +139,7 @@ else fi fi rm -f $tmpfile + fi fi diff --git a/debian/mdadm.config b/debian/mdadm.config index 85745a34..2cf4f4b8 100644 --- a/debian/mdadm.config +++ b/debian/mdadm.config @@ -141,7 +141,6 @@ while true; do db_go db_get mdadm/initrdstart_notinconf if [ "$RET" = true ]; then - md5sum $CONFIG > /var/lib/mdadm/CONF-UNCHECKED error=0 else db_fset mdadm/initrdstart seen false diff --git a/debian/mdadm.dirs b/debian/mdadm.dirs deleted file mode 100644 index 47f8376c..00000000 --- a/debian/mdadm.dirs +++ /dev/null @@ -1 +0,0 @@ -var/lib/mdadm diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst index 9b07950c..44a1e850 100644 --- a/debian/mdadm.postinst +++ b/debian/mdadm.postinst @@ -109,6 +109,11 @@ _eof db_stop command -v update-initramfs >/dev/null 2>&1 && update-initramfs -u + + if dpkg --compare-versions "$2" le 3.3.2-1; then + rm -f /var/lib/mdadm/CONF-UNCHECKED + rm -f /var/lib/mdadm/mdadm.conf-generated + fi ;; esac diff --git a/debian/mdadm.postrm b/debian/mdadm.postrm index 387fbeaf..80591a76 100644 --- a/debian/mdadm.postrm +++ b/debian/mdadm.postrm @@ -14,16 +14,6 @@ case "${1:-}" in fi ;; - purge) - GEN_SENTINEL=/var/lib/mdadm/mdadm.conf-generated - if [ -r $GEN_SENTINEL ]; then - rm -f "$(sed -rne 's,[[:xdigit:]]+ ,,p' $GEN_SENTINEL)" - fi - rm -f /etc/default/mdadm /etc/mdadm.conf /etc/mdadm/mdadm.conf - rm -rf /var/lib/mdadm - ;; - - *) :;; esac # just in case somebody actually purges mdadm, we need this to make debconf diff --git a/debian/mkconf.in b/debian/mkconf.in index 129d497b..a580f5b3 100644 --- a/debian/mkconf.in +++ b/debian/mkconf.in @@ -8,7 +8,6 @@ set -eu ME="${0##*/}" -VERSION=%VERSION% MDADM=/sbin/mdadm DEBIANCONFIG=/etc/default/mdadm CONFIG=/etc/mdadm/mdadm.conf @@ -34,7 +33,6 @@ if [ -r "$CONFIG" ]; then PROGRAM="$(sed -ne 's/^PROGRAM //p' $CONFIG)" fi -generate=0 [ "${1:-}" = force-generate ] && rm -f $CONFIG case "${1:-}" in generate|force-generate) @@ -47,7 +45,6 @@ case "${1:-}" in mkdir --parent ${CONFIG%/*} exec >$CONFIG - generate=1 ;; esac @@ -99,16 +96,6 @@ else fi fi -if [ $generate -eq 1 ]; then - echo "# This file was auto-generated on $(date -R)" -else - echo "# This configuration was auto-generated on $(date -R)" -fi -echo "# by mkconf $VERSION" - -if [ $generate -eq 1 ]; then - mkdir -p /var/lib/mdadm - md5sum $CONFIG > /var/lib/mdadm/mdadm.conf-generated -fi +echo "# This configuration was auto-generated on $(date -R) by mkconf" exit $error |