[DRBD-cvs] scripts by phil; * removed the infrastructure for built-i...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Project : drbd
Module  : scripts

Dir     : drbd/scripts


Modified Files:
      Tag: rel-0_7-branch
	drbd.conf 


Log Message:
* removed the infrastructure for built-in-help from drbdadm. 
* Fixed the sample configuration file. 

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/scripts/drbd.conf,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -u -3 -r1.5.2.10 -r1.5.2.11
--- drbd.conf	11 Feb 2004 13:25:20 -0000	1.5.2.10
+++ drbd.conf	12 Feb 2004 20:24:48 -0000	1.5.2.11
@@ -79,10 +79,13 @@
   }
 
   disk {
-    # if the lower level device reports io-error, we panic!
-    # (standby node takes over)
-    # comment this out, if you want to survive this, e.g. you do testing
-    # only, or you have other means to cope with that.
+    # if the lower level device reports io-error you have the choice of
+    #  "pass_on"  ->  Report the io-error to the upper layers.
+    #                 Primary   -> report it to the mounted file system.
+    #                 Secondary -> ignore it.
+    #  "panic"    ->  The node leaves the cluster by doing a kernel panic.
+    #  "detach"   ->  The node drops its backing storage device, and
+    #                 continues in disk less mode.
     on-io-error = detach
 
     # the device size in bytes, default unit is k (1 block == 1024 bytes)
@@ -189,6 +192,7 @@
     disk=/dev/hde6
     address=192.168.22.11
     port=7789
+    meta-disk=internal
   }
 
   on alf {
@@ -196,6 +200,7 @@
     disk=/dev/hdc6
     address=192.168.22.12
     port=7789
+    meta-disk=internal
   }
 }
 
@@ -231,6 +236,7 @@
     disk=/dev/hde7
     address=192.168.22.11
     port=7790
+    meta-disk=internal
   }
 
   on alf {
@@ -238,6 +244,7 @@
     disk=/dev/hdc7
     address=192.168.22.12
     port=7790
+    meta-disk=internal
   }
 }
 
@@ -251,7 +258,7 @@
   }
 
   disk {
-    do-panic
+    on-io-error = detach
     # size=1G
   }
 
@@ -273,6 +280,7 @@
     disk=/dev/hde8
     address=192.168.22.11
     port=7791
+    meta-disk=internal
   }
 
   on alf {
@@ -280,5 +288,6 @@
     disk=/dev/hdc8
     address=192.168.22.12
     port=7791
+    meta-disk=internal
   }
 }