Changeset 3661 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

Adds preliminary DRBD support

Location:

branches/3.3/mindi

Files:

• README.bootparam (modified) (1 diff)
• mindi (modified) (10 diffs)
• rootfs/etc/init.d/rcS (modified) (3 diffs)
• rootfs/usr/sbin/start-netfs (modified) (1 diff)

branches/3.3/mindi/README.bootparam

@@ -18 +18 @@
 net         Activate network support
 nodmraid    Do not try to start dmraid support
+nodrbd      Do not try to start DRBD support
 nohw        Do not call the mindi-rsthw script to restore your HW configuration
 nolvm       Do not try to start LVM support

branches/3.3/mindi/mindi

@@ -69 +69 @@
 
 # ide-probe-mod
-IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs edd paride ata_generic ata_piix dock via82cxxx generic nvidia ahci sata_nv cmd64x pata_via pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp pata_acpi amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw virtio virtio_blk virtio_pci hv_storvsc raid0 raid1 raid456"
+IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs edd paride ata_generic ata_piix dock via82cxxx generic nvidia ahci sata_nv cmd64x pata_via pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp pata_acpi amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw virtio virtio_blk virtio_pci hv_storvsc raid0 raid1 raid456 drbd"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 USB_MODS="usb-storage usb_storage usb-ohci usb-uhci input hid hid_generic hid-generic hid_microsoft hid-microsoft uhci_hcd uhci-hcd ehci-hcd ehci-pci ohci-hcd ohci_hcd ohci-pci xhci xhci-hcd usbkbd usbhid keybdev mousedev scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
@@ -506 +506 @@
     KBDEPTH=0
     AddKeyboardMappingFile $mappath
-    echo ""
     echo -e "$DONE"
     rm -f $MINDI_TMP/keymaps.find
@@ -666 +665 @@
         done
     fi
-    echo -en "$DONE\nINFO: Making complete dependency list"
-
+    echo -e "$DONE"
+
+    echo -en "INFO: Making complete dependency list..."
     tr -s '/' '/' < $tempfile | sort -u > $tempfile.new
     mv -f $tempfile.new $tempfile
@@ -690 +690 @@
         fi
         if cp -f $MINDI_TMP/mondo*restore $bigdir/usr/bin 2>> $LOGFILE ; then
-            LocateDeps $bigdir/usr/bin/mondo*restore >> $outfile.pre
+            LocateDeps $bigdir/usr/bin/mondo*restore >> $outfile.pre
         else
             LogAll "ERROR: Cannot find mondo*restore in mondo's tempdir, $MINDI_TMP"
             LogAll "       I bet you've got a spare copy of Mondo or Mindi floating around on your system."
-            LogAll "       If Mindi was called by Mondo then send a bug report."
+            LogAll "       If Mindi was called by Mondo then send a bug report."
             LogAll "       It not, type 'ps ax' to see which Mondo-related process is still running then kill it. :-)"
             LogAll "       Finally, run Mindi again."
-            Die "Odd."
+            Die "Odd."
         fi
         cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2>> $LOGFILE || LogAll "\nINFO: Mondo v1.2x defaults to LILO as the bootloader, BTW."
@@ -710 +710 @@
     tr ' ' '\n' < $outfile.pre | tr -s '/' '/' | grep -Fvx "" | sort -u | grep -Ev "/libX11|/libXext|/libXi|/libgtk|/libgdk" > $outfile
     rm -f $tempfile $outfile.pre
-    [ "$res" -eq "0" ] && echo -e "\r\t\t\t\t\t\t\t\t$DONE" || echo "\nFailed."
+    [ "$res" -eq "0" ] && echo -e "$DONE" || echo "\nFailed."
     return $res
 }
@@ -892 +892 @@
     for fname in $incoming ; do
         if [ ! -e "$fname" ] ; then
-            LogFile "WARNING: $fname does not exist; cannot be LDD'd."
+            LogFile "WARNING: $fname does not exist; cannot be LDD'd."
             if echo $fname | grep lvm &> /dev/null ; then
                 LogFile "          This warning only affects you if you are using LVM."
@@ -2624 +2624 @@
     noof_lines=`echo $lis2 | wc -w`
     progress=0
-    lis=""
     # Get only the files which exist in that list
     # and potentially their symlink structure
+    # put apart directories for later handling
     for f in $lis2; do
         if [ -d $f ]; then
-            for g in `find $f`; do 
+            for g in `find $f`; do
                 echo $g >> $MINDI_TMP/$conf.lis
                 LocateDeps $g  >> $MINDI_TMP/$conf.lis2
             done
             lis3="$lis3 $f"
-        else 
+        else
             if [ -r $f ]; then
                 echo $f >> $MINDI_TMP/$conf.lis
@@ -2718 +2718 @@
     # copy from rootfs into mountpoint
     LogAll "INFO: Copying Mindi files onto $mountpoint"
-    for f in $tgz_dir_fname/*; do 
+    for f in $tgz_dir_fname/*; do
         if [ ! -r $f ]; then
             Die "ERROR: Unable to copy $f to the target dir. Check your installation or McAfee presence"
@@ -2776 +2776 @@
     # Avoids an issue on some distro (RHEL5)
     rm -f $mountpoint/etc/ld.so.conf.d/kernelcap*
+
+    # Management of DRBD
+    which drbdadm &> /dev/null
+    if [ $? -eq 0 ]; then
+        # Do we find DRBD devices setup
+        drbdadm sh-dev all | grep -E '^/dev' &> /dev/null
+        if [ $? -eq 0 ]; then
+            CopyFromConf drbd
+        fi
+        # DRBD requires net activation
+        MINDI_ADDITIONAL_BOOT_PARAMS="$MINDI_ADDITIONAL_BOOT_PARAMS drbd"
+    fi
 
     # Management of udev (which includes modprobe in rules)
@@ -3386 +3398 @@
     elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
         MONDO_TMP=$2
-        # Change MINDI_TMP for the one provided by mondo 
+        # Change MINDI_TMP for the one provided by mondo
         # So that it can get back the built files
         if [ _"$MONDO_TMP" = _"" ]; then

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