commit f033758c5c6652ad0febd7ee89a6beb010bc3118
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Jul 13 15:24:46 2018 +0200
- rel 4; Don't fail if arrays are already assembled (ex raid10 with 4
devices, one device gets removed/kicked from array).
rc-scripts-git.patch | 27 +++++++++++++++++++++++++++
rc-scripts.spec | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/rc-scripts.spec b/rc-scripts.spec
index c0f60eb..099c004 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -11,7 +11,7 @@ Summary(pl.UTF-8): inittab i skrypty startowe z katalogu
/etc/rc.d
Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları
Name: rc-scripts
Version: 0.4.16
-Release: 3
+Release: 4
License: GPL v2
Group: Base
#Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
diff --git a/rc-scripts-git.patch b/rc-scripts-git.patch
index c16153b..fb0b8e3 100644
--- a/rc-scripts-git.patch
+++ b/rc-scripts-git.patch
@@ -58,3 +58,30 @@ index f7f0eea..99bb078 100755
fi
if is_fsmounted usbfs /proc/bus/usb; then
+commit 8903a3b15f08d759d06bb2b02e637e0baf7497bf
+Author: Arkadiusz Miśkiewicz <[email protected]>
+Date: Tue Jul 3 15:13:45 2018 +0200
+
+ Don't fail if arrays are already assembled (ex raid10 with 4 devices, one
device gets removed/kicked from array).
+
+diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
+index 99bb078..6fdca19 100755
+--- a/rc.d/rc.sysinit
++++ b/rc.d/rc.sysinit
+@@ -326,8 +326,15 @@ init_mdadm() {
+ fi
+
+ show "Starting up RAID devices"; busy
+- /sbin/mdadm --assemble --scan --auto=yes
++ mdadm_out=$(/sbin/mdadm --assemble --scan --auto=yes 2>&1)
+ rc=$?
++
++ if (echo -n "$mdadm_out" | grep -q "Found some drive for an array that
is already active:"); then
++ rc=0
++ fi
++
++ echo -n "$MDADM_OUT" >&2
++
+ if [ "$rc" -eq 0 -o "$rc" -eq 2 ]; then
+ # rc is used later too, so set sane value
+ rc=0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rc-scripts.git/commitdiff/f033758c5c6652ad0febd7ee89a6beb010bc3118
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
