summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2017-06-22 13:05:59 +0100
committerDimitri John Ledkov <xnox@ubuntu.com>2017-06-22 13:05:59 +0100
commit4bbd1418af1ec2cd7992749a4f822e714ede57b8 (patch)
tree4ef09976be8f247c68bef147933cc124a0848c22 /debian
parentd958a32577d29205ed38f78cf873b82db8059b99 (diff)
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.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/initramfs/hook9
2 files changed, 5 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 2eb7afb..cb0e003 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 4e94c20..a8a71e9 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