diff options
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/initramfs/hook | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 2eb7afb0..cb0e0034 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ mdadm (4.0-1) UNRELEASED; urgency=medium * New upstream release. LP: #1668128 + * Drop warnings that raid arrays are missing from the initramfs + configuration. Instead have a positive message as to which arrays are + included in the initramfs. -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 12 May 2017 12:31:46 +0100 diff --git a/debian/initramfs/hook b/debian/initramfs/hook index 4e94c204..a8a71e96 100644 --- a/debian/initramfs/hook +++ b/debian/initramfs/hook @@ -88,7 +88,6 @@ else sed -i '/^CREATE/s/^/#/' $DESTMDADMCONF if ! grep -q '^ARRAY' $CONFIG; then tmpfile="${DESTMDADMCONF}.tmp" - warn "$CONFIG defines no arrays." if /usr/share/mdadm/mkconf > $tmpfile; then cp -p $tmpfile $DESTMDADMCONF else @@ -98,12 +97,8 @@ else # make sure the configuration file knows about all running devices /sbin/mdadm --detail --scan | while read array device params; do uuid=${params#*UUID=}; uuid=${uuid%% *} - if ! grep -qi "UUID=$uuid" $DESTMDADMCONF; then - warn "the array $device with UUID $uuid" - warn "is currently active, but it is not listed in mdadm.conf. if" - warn "it is needed for boot, then YOUR SYSTEM IS NOW UNBOOTABLE!" - warn "please inspect the output of /usr/share/mdadm/mkconf, compare" - warn "it to $CONFIG, and make the necessary changes." + if grep -qi "UUID=$uuid" $DESTMDADMCONF; then + info "$uuid $device added to the mdadm.conf in the initramfs" fi done fi |