[DRBD-cvs] user by phil; * Made "drbdsetup down" to also do "drbd...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Project : drbd
Module  : user

Dir     : drbd/user


Modified Files:
      Tag: rel-0_7-branch
	drbdsetup.c 


Log Message:
* Made "drbdsetup down" to also do "drbdsetup secondary"
* Improved error messages of "drbdsetup detach" if it is primary/unconnected.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/drbdsetup.c,v
retrieving revision 1.54.2.24
retrieving revision 1.54.2.25
diff -u -3 -r1.54.2.24 -r1.54.2.25
--- drbdsetup.c	3 Mar 2004 16:07:59 -0000	1.54.2.24
+++ drbdsetup.c	4 Mar 2004 21:10:08 -0000	1.54.2.25
@@ -873,6 +873,7 @@
 
 int cmd_down(int drbd_fd,char** argv,int argc,struct option *options)
 {
+  cmd_secondary(drbd_fd,argv,argc,options);
   cmd_disconnect(drbd_fd,argv,argc,options);
   cmd_detach(drbd_fd,argv,argc,options);
   return 0;
@@ -889,6 +890,9 @@
       perror("ioctl() failed");
       if(err==EBUSY)
 	fprintf(stderr,"Not possible during resynchronisation.\n");
+      if(err==ENETRESET)
+	fprintf(stderr,"Not possible, since the device is in primary state\n"
+		"and not connected.\n");
       if(err==ENXIO)
 	fprintf(stderr," - Do not shoot yourself in the foot. -\n"
 		"A system without backing storage is not possible.\n");