diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/initramfs/script.local-top | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 363aeb68..5328a5fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ mdadm (3.3.2-1) UNRELEASED; urgency=low * removed remove-bashism-from-makefile.patch (applied upstream) * copy 64-md-raid-assembly.rules to initramfs too, this should bring us array auto-assemble during initramfs run (Closes: #678691) + * denote inability to initialize md subsystem in local-top script + from fatal error to warning (Closes: #733574) -- Michael Tokarev <mjt@tls.msk.ru> Sat, 20 Sep 2014 08:49:59 +0400 diff --git a/debian/initramfs/script.local-top b/debian/initramfs/script.local-top index 166f256f..b95ad896 100644 --- a/debian/initramfs/script.local-top +++ b/debian/initramfs/script.local-top @@ -17,7 +17,7 @@ maybe_break pre-mdadm if [ -e /scripts/local-top/md ]; then log_warning_msg "old md initialisation script found, getting out of its way..." - exit 1 + exit 0 fi MDADM=/sbin/mdadm @@ -42,11 +42,11 @@ if [ "$MD_DEVS" = none ]; then fi if [ ! -f /proc/mdstat ] && ! modprobe -q md_mod; then - verbose && log_failure_msg "failed to load module md_mod." + verbose && log_warning_msg "failed to load module md_mod." fi if [ ! -f /proc/mdstat ]; then - verbose && panic "cannot initialise MD subsystem (/proc/mdstat missing)" - exit 1 + verbose && log_warning_msg "cannot initialise MD subsystem (/proc/mdstat missing)" + exit 0 fi # prevent writes/syncs so that resuming works (#415441). |