[PATCH 3/5] Made unionmount always include the underlying node

[Sergiu Ivanov]

diff --git a/main.c b/main.c
index c33b065..e407926 100644
--- a/main.c
+++ b/main.c
@@ -77,6 +77,9 @@ main (int argc, char **argv)
   /* Argument parsing.  */
   argp_parse (&argp_startup, argc, argv, ARGP_IN_ORDER, 0, 0);

+  /* Register the underlying node in the ulfs list.  */
+  ulfs_register (NULL, 0, 0);
+
   err = node_create_root (&netfs_root_node);
   if (err)
     error (EXIT_FAILURE, err, "failed to create root node");
diff --git a/netfs.c b/netfs.c
index 89d1bf6..7c375d2 100644
--- a/netfs.c
+++ b/netfs.c
@@ -71,9 +71,9 @@ netfs_append_args (char **argz, size_t *argz_len)
        {
          if (ulfs->path)
            err = argz_add (argz, argz_len, ulfs->path);
-         else
+         /*      else
            err = argz_add (argz, argz_len,
-                           OPT_LONG (OPT_LONG_UNDERLYING));
+           OPT_LONG (OPT_LONG_UNDERLYING));*/
        }
     }

diff --git a/options.c b/options.c
index ef29a02..c03676d 100644
--- a/options.c
+++ b/options.c
@@ -43,8 +43,8 @@ static int parsing_startup_options_finished;
 /* Argp options common to the runtime and startup parser.  */
 static const struct argp_option argp_common_options[] =
   {
-    { OPT_LONG_UNDERLYING, OPT_UNDERLYING, 0, 0,
-      "add the underlying node to the unionfs" },
+    /*    { OPT_LONG_UNDERLYING, OPT_UNDERLYING, 0, 0,
+         "add the underlying node to the unionfs" },*/
     { OPT_LONG_WRITABLE, OPT_WRITABLE, 0, 0,
       "specify the following filesystem as writable" },
     { OPT_LONG_DEBUG, OPT_DEBUG, 0, OPTION_HIDDEN,
@@ -124,7 +124,7 @@ argp_parse_common_options (int key, char *arg,
struct argp_state *state)
       ulfs_match = 0;
       break;

-    case OPT_UNDERLYING:       /* --underlying  */
+      /*case OPT_UNDERLYING:*/ /* --underlying  */
     case ARGP_KEY_ARG:

       if (ulfs_mode == ULFS_MODE_REMOVE)
diff --git a/options.h b/options.h
index eb74ce6..5ff1da5 100644
--- a/options.h
+++ b/options.h
@@ -20,7 +20,7 @@
 /* Argument parsing.  */

 /* The possible short options.  */
-#define OPT_UNDERLYING 'u'
+/*#define OPT_UNDERLYING 'u'*/
 #define OPT_WRITABLE   'w'
 #define OPT_DEBUG      'd'
 #define OPT_CACHE_SIZE 'c'
@@ -31,7 +31,7 @@
 #define OPT_STOW       's'

 /* The long options.  */
-#define OPT_LONG_UNDERLYING "underlying"
+/*#define OPT_LONG_UNDERLYING "underlying"*/
 #define OPT_LONG_WRITABLE   "writable"
 #define OPT_LONG_DEBUG      "debug"
 #define OPT_LONG_CACHE_SIZE "cache-size"
-- 
1.5.2.4