diff options
| author | Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com> | 2012-06-15 14:51:47 +0100 |
|---|---|---|
| committer | Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com> | 2012-06-25 13:39:18 +0100 |
| commit | 5876c26bec473a625cbb93cda5a9dedef6153064 (patch) | |
| tree | de1400eb5606a601a046621db19dcbefeead73e8 /debian | |
| parent | c9bc5d1829868f6ce20594a9eb5d188c49139ddc (diff) | |
Use dh_installinit with --no-restart-on-upgrade, which will start arrays, but will not stop them during upgrade.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/mdadm.postinst | 11 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 5 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 2a2faa3c..102790b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ mdadm (3.2.5-2) UNRELEASED; urgency=low [ Michael Tokarev ] * fix spelling mistakes in previous changelog entry + [ Dmitrijs Ledkovs ] + * Use dh_installinit with --no-restart-on-upgrade, which will start + arrays, but will not stop them during upgrade. + -- Michael Tokarev <mjt@tls.msk.ru> Fri, 22 Jun 2012 11:58:11 +0400 mdadm (3.2.5-1) unstable; urgency=low diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst index 56d3cb37..8dc90b8a 100644 --- a/debian/mdadm.postinst +++ b/debian/mdadm.postinst @@ -181,14 +181,3 @@ fi # See #369953 set +u #DEBHELPER# -set -u - -# do start mdadm-raid, but don't use dh_installinit to do so, to prevent -# stopping raids on remove/upgrade. -if [ -x /etc/init.d/mdadm-raid ]; then - if [ -x "$(command -v invoke-rc.d)" ]; then - invoke-rc.d mdadm-raid start || exit $? - else - /etc/init.d/mdadm-raid start || exit $? - fi -fi diff --git a/debian/rules b/debian/rules index a07debe3..b6f99bb7 100755 --- a/debian/rules +++ b/debian/rules @@ -91,7 +91,7 @@ binary-arch: build install dh_installdebconf dh_installdocs dh_installexamples debian/mdadd.sh - dh_installinit --init-script=mdadm-raid --no-start -- start 25 S . start 60 0 6 . + dh_installinit --init-script=mdadm-raid --no-restart-on-upgrade -- start 25 S . start 60 0 6 . dh_installinit -- defaults 25 dh_installman dh_installcron |