[DRBD-cvs] r1540 - trunk/user

[svn at svn.drbd.org]

Author: phil
Date: 2004-09-20 22:14:10 +0200 (Mon, 20 Sep 2004)
New Revision: 1540

Modified:
   trunk/user/drbdsetup.c
Log:
drbdadm adjust failed if drbdsetup show printed "(null)"
as device name. E.g.:
Lower device: 00:00   ((null))

Made drbdsetup to never print "(null)" as the device name.



Modified: trunk/user/drbdsetup.c
===================================================================
--- trunk/user/drbdsetup.c	2004-09-09 17:57:28 UTC (rev 1539)
+++ trunk/user/drbdsetup.c	2004-09-20 20:14:10 UTC (rev 1540)
@@ -1170,11 +1170,12 @@
   // this is because the SmartArray (Compaq, HP, whatever...) driver
   // returns a closing bracket in the device name...
 
-  if(!dev_name[0] || index(dev_name,')'))
+  if(!dev_name || !dev_name[0] || index(dev_name,')') )
     {
-      return guess_dev_name("/dev",major,minor);
+      dev_name = guess_dev_name("/dev",major,minor);
     }
-  return dev_name;
+  if(dev_name) return dev_name;
+  else return "n.a.";
 }
 
 int cmd_show(int drbd_fd,char** argv,int argc,struct option *options)