projects / packages / rc-scripts.git / blame
| Commit | Line | Data |
|---|---|---|
| f033758c AM |
1 | diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit |
| 2 | index 99bb078..6fdca19 100755 | |
| 3 | --- a/rc.d/rc.sysinit | |
| 4 | +++ b/rc.d/rc.sysinit | |
| 5 | @@ -326,8 +326,15 @@ init_mdadm() { | |
| 6 | fi | |
| 7 | ||
| 8 | show "Starting up RAID devices"; busy | |
| 9 | - /sbin/mdadm --assemble --scan --auto=yes | |
| 10 | + mdadm_out=$(/sbin/mdadm --assemble --scan --auto=yes 2>&1) | |
| 11 | rc=$? | |
| 12 | + | |
| 13 | + if (echo -n "$mdadm_out" | grep -q "Found some drive for an array that is already active:"); then | |
| 14 | + rc=0 | |
| 15 | + fi | |
| 16 | + | |
| 17 | + echo -n "$MDADM_OUT" >&2 | |
| 18 | + | |
| 19 | if [ "$rc" -eq 0 -o "$rc" -eq 2 ]; then | |
| 20 | # rc is used later too, so set sane value | |
| 21 | rc=0 | |
| 6383dc32 AM |
22 | commit 5d2ee544efe6d27d1b6bc263385c5c9b5bf1b00d |
| 23 | Author: Arkadiusz Miśkiewicz <arekm@maven.pl> | |
| 24 | Date: Thu Jan 18 10:41:54 2018 +0100 | |
| 25 | ||
| 26 | Onlink doesn't work for IPv6, so add gate route manually first. | |
| 27 | ||
| 28 | diff --git a/lib/functions.network b/lib/functions.network | |
| 29 | index bb7a525..d151b04 100644 | |
| 30 | --- a/lib/functions.network | |
| 31 | +++ b/lib/functions.network | |
| 32 | @@ -299,6 +299,7 @@ setup_ip_gw_ro () | |
| 33 | if [ -z "${IPV6_GLOBALROUTEDEV}" -o "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then | |
| 34 | # set up default route | |
| 35 | if [ "${IPV6_GLOBALROUTEGW}" ]; then | |
| 36 | + ip -6 route add ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink | |
| 37 | ip -6 route add 2000::/3 via ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink | |
| 38 | elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then | |
| 39 | ip -6 route add 2000::/3 dev ${DEVICE} ${IP6SRCADDR} |