Changeset 3661 in MondoRescue for branches/3.3/mindi/rootfs

Timestamp:

May 3, 2017, 11:27:12 AM (7 years ago)

Author:

Bruno Cornec

Message:

Adds preliminary DRBD support

Location:

branches/3.3/mindi/rootfs

Files:

• etc/init.d/rcS (modified) (3 diffs)
• usr/sbin/start-netfs (modified) (1 diff)

branches/3.3/mindi/rootfs/etc/init.d/rcS

@@ -648 +648 @@
 }
 
+StartDRBD() {
+    if [ "`grep -i nodrbd /proc/cmdline`" ]; then
+        return;
+    fi
+    if [ "`grep -i drbd /proc/cmdline`" ]; then
+        echo "Starting DRBD..."
+        mkdir -p /var/run/drbd
+        drbdadm adjust-with-progress all
+        drbdadm wait-con-int
+        # Become primary
+        drbdadm sh-b-pri
+        drbdadm sh-status
+        drbdsetup all show
+        LogIt "DRBD started"
+    fi
+}
+
 StartRaids() {
     local raid_devices i
@@ -976 +993 @@
     touch /tmp/mondorestore.cfg
 fi
-if [ "`grep -i pxe /proc/cmdline`" ] || [ "`grep -i net /proc/cmdline`" ] || [ "`grep 'netfs-proto ' /tmp/mondorestore.cfg`" ]; then
+if [ "`grep -i pxe /proc/cmdline`" ] || [ "`grep -i net /proc/cmdline`" ] || [ "`grep 'netfs-proto ' /tmp/mondorestore.cfg`" ] || [ "`grep -i drbd /proc/cmdline`" ]; then
     # We need to get here exported variables from start-netfs
     . /usr/sbin/start-netfs
@@ -1031 +1048 @@
 StartRaids
 StartMpath
+StartDRBD
 # avoids messagesa round leaked fd - Cf lvm man page
 export LVM_SUPPRESS_FD_WARNINGS=1

branches/3.3/mindi/rootfs/usr/sbin/start-netfs

@@ -128 +128 @@
     fi
 
-    # ping server helps waking interface up
-    LogIt "INFO: Pinging Remote server..."
+    # ping gateway helps waking interface up
+    LogIt "INFO: Pinging Gateway $ipgateway..."
+    ping -c $ipcount $ipgateway
+
+    if [ "`grep -i drbd /proc/cmdline`" ]; then
+        # Time to exit for DRBD setup, the rest is for NETFS
+        exit 0
+    fi
+
+    # ping remote NETFS server
     netfs_server_ipaddr=`echo $netfsmount | cut -d: -f1 | cut -d@ -f2`
+    LogIt "INFO: Pinging Remote server $netfs_server_ipaddr ..."
     ping -c $ipcount $netfs_server_ipaddr