[SSI] openssi/util-linux/mount mount.c,1.1.5.1.2.5,1.1.5.1.2.6

Update of /cvsroot/ssic-linux/openssi/util-linux/mount
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19271

Modified Files:
      Tag: OPENSSI-DEBIAN
        mount.c 
Log Message:
merge with redhat



Index: mount.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/util-linux/mount/Attic/mount.c,v
retrieving revision 1.1.5.1.2.5
retrieving revision 1.1.5.1.2.6
diff -u -d -r1.1.5.1.2.5 -r1.1.5.1.2.6
--- mount.c     30 Mar 2004 00:05:51 -0000      1.1.5.1.2.5
+++ mount.c     28 May 2004 03:32:23 -0000      1.1.5.1.2.6
@@ -634,6 +634,8 @@
                             _("mount: %s duplicate - not mounted"),
                             mc->m.mnt_fsname, _PATH_FSTAB);
                }
+       } else if (strstr(spec, "/nbd/") != NULL) {
+               spec = strdup(mc->m.mnt_fsname);
        } else
                spec = 0;               /* just for gcc */
 
@@ -1305,9 +1307,10 @@
 
   /* If chard specified, then device must be UUID= or LABEL= */
   /* OK, if /dev/root, since that is how the linuxrc does initial root mount */
+  /* DRBD uses /dev/nbd/* so allow that as well */
   if (opts && has_chard_opt(opts)) {
       if (strncmp(spec, "UUID=", 5) && strncmp(spec, "LABEL=", 6) != 0 &&
-       strcmp(spec, "/dev/root") != 0)
+       strcmp(spec, "/dev/root") != 0 && strstr(spec, "/nbd/") == NULL)
          die (EX_FAIL,
               _("mount: %s: only devices specified as UUID= or LABEL= "
                 "can be mounted chard\n"), spec);
@@ -1852,8 +1855,10 @@
                for (i = 0; i < node_count; i++) {
                        clusternode_info_t info;
 
-                       if (clusternode_info(nodes[i], sizeof(info), &info) == 
-1)
+                       if (clusternode_info(nodes[i], sizeof(info), &info) == 
-1) {
                                perror("clusternode_info");
+                               continue;
+                       }
                        if (info.node_state == CLUSTERNODE_UP ||
                            info.node_state == CLUSTERNODE_COMINGUP)
                                break;



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click