Remove bloat. Support multiple mounts

Author: gorbak25

Makefile.am

@@ -3,9 +3,6 @@ AM_CPPFLAGS = -Wall -Wextra
 pkglibexec_PROGRAMS = tiny_initramfs
 
 tiny_initramfs_SOURCES    = tiny_initramfs.c io.c mount.c log.c devices.c util.c
-if ENABLE_NFS4
-  tiny_initramfs_SOURCES += nfs.c
-endif
 tiny_initramfs_CFLAGS     = -fno-inline-small-functions -fno-caller-saves
 tiny_initramfs_LDFLAGS    = -static
 

configure.ac

@@ -12,11 +12,6 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
   Makefile
 ])
-AC_ARG_ENABLE([uuid], [AS_HELP_STRING([--disable-uuid], [Enable support for searching for devices via their UUID (default is yes)])])
-AS_IF([test x"$enable_uuid" != x"no"], [AC_DEFINE([ENABLE_UUID], [1], [Define if UUID support is enabled])])
-AC_ARG_ENABLE([nfs4], [AS_HELP_STRING([--enable-nfs4], [Enable support for mounting NFSv4 shares (default is no)])])
-AS_IF([test x"$enable_nfs4" = x"yes"], [AC_DEFINE([ENABLE_NFS4], [1], [Define if NFS4 support is enabled])])
-AM_CONDITIONAL([ENABLE_NFS4], [test x"$enable_nfs4" = x"yes"])
 AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], [Enable support for printing debug messages])])
 AS_IF([test x"$enable_debug" = x"yes"], [AC_DEFINE([ENABLE_DEBUG], [1], [Define if debug messages are enabled])])
 AC_ARG_ENABLE([modules], [AS_HELP_STRING([--enable-modules], [Enable support for loading modules (default is no)])])

devices.c

@@ -32,7 +32,6 @@
 #include <stdint.h>
 #include <sys/sysmacros.h>
 
-#ifdef ENABLE_UUID
 #include <dirent.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -91,7 +90,6 @@ int parse_uuid(char *uuid_buf /* 16 bytes */, const char *string_representation)
 
   return 0;
 }
-#endif /* defined(ENABLE_UUID) */
 
 void wait_for_device(char *real_device_name, int *timeout, const char *device, int delay)
 {
@@ -117,12 +115,9 @@ void wait_for_device(char *real_device_name, int *timeout, const char *device, i
   /* Our timeout starts *after* the rootdelay. */
   start = time(NULL);
 
-#ifdef ENABLE_UUID
   if (type != WANT_NAME) {
     have_device = scan_devices(real_device_name, type, major, minor, uuid, serial);
-  } else
-#endif
-  {
+  } else {
     set_buf(real_device_name, MAX_PATH_LEN, device, NULL);
     have_device = access(device, F_OK) != 0;
   }
@@ -143,11 +138,9 @@ void wait_for_device(char *real_device_name, int *timeout, const char *device, i
     struct timespec rem;
     (void)nanosleep(&req, &rem);
 
-#ifdef ENABLE_UUID
     if (type != WANT_NAME)
       have_device = scan_devices(real_device_name, type, major, minor, uuid, serial);
     else
-#endif
       have_device = access(device, F_OK) != 0;
   }
 
@@ -163,18 +156,11 @@ void wait_for_device(char *real_device_name, int *timeout, const char *device, i
 
 int is_valid_device_name(const char *device_name, int *type, unsigned int* major, unsigned int *minor, char *uuid, char *serial)
 {
-#ifdef ENABLE_UUID
   int r;
   char *endptr;
   char uuid_buf[32 + 4 + 1] = { 0 };
   char uuid_temp[16];
   unsigned long x;
-#else
-  (void)major;
-  (void)minor;
-  (void)uuid;
-  (void)serial;
-#endif
 
   if (!device_name)
     return 0;
@@ -201,7 +187,6 @@ int is_valid_device_name(const char *device_name, int *type, unsigned int* major
     return 1;
   }
 
-#ifdef ENABLE_UUID
   /* 0x803 or so for 8:3 */
   if (device_name[0] == '0' && device_name[1] == 'x') {
     x = strtoul(device_name + 2, &endptr, 16);
@@ -240,12 +225,10 @@ int is_valid_device_name(const char *device_name, int *type, unsigned int* major
       *type = WANT_UUID;
     return r;
   }
-#endif
 
   return 0;
 }
 
-#ifdef ENABLE_UUID
 /* Which data types for this structure is available is wildly
  * incompatible between libc implementations, so we just use the
  * stdint.h types. */
@@ -501,5 +484,3 @@ int is_fs_with_serial(const char *device_name, const char *serial)
 
   return strncmp(serial, device_serial, VIRTIO_BLK_ID_BYTES) == 0;
 }
-
-#endif /* defined(ENABLE_UUID) */

mount.c

@@ -47,8 +47,7 @@ static void determine_supported_filesystems();
 static int process_proc_filesystems(void *data, const char *line, int line_is_incomplete);
 
 int mount_filesystem(const char *source, const char *target,
-                     const char *type, const char *flags,
-                     int override_flags_add, int override_flags_subtract)
+                     const char *type, const char *flags)
 {
   int options;
   char data[MAX_LINE_LEN];
@@ -59,32 +58,12 @@ int mount_filesystem(const char *source, const char *target,
   warn("mount_filesystem(\"", source, "\", \"", target, "\", \"", type ? type : "(null)", "\", \"", flags, "\", ...): begin", NULL);
 #endif
 
-#ifdef ENABLE_NFS4
-  if (type && (!strcmp(type, "nfs") || !strcmp(type, "nfs4")))
-    nfsver = !strcmp(type, "nfs4") ? 4 : 0;
-#endif
   options = parse_mount_options(data, MAX_LINE_LEN, flags, nfsver != -1 ? &nfsver : NULL);
 
 #ifdef ENABLE_DEBUG
   warn("mount_filesystem: parsing mount options (done), unparsed options: ", data, NULL);
 #endif
 
-  options |= override_flags_add;
-  options &= ~override_flags_subtract;
-
-#ifdef ENABLE_NFS4
-  if (type && !strcmp(type, "nfs4") && nfsver != 4)
-    panic(0, "Cannot combine [nfs]vers=2/3 option with filesystem type nfs4.", NULL);
-  if (type && (!strcmp(type, "nfs") || !strcmp(type, "nfs4"))) {
-    if (nfsver != 4 && nfsver != 0)
-      panic(0, "Sorry, only NFSv4 is currently supported.", NULL);
-    /* Note that nfsver == 0 means we have type == nfs and no vers= parameter
-     * at this point - which means that in principle we should try first NFSv4
-     * and then NFSv3/2. But until we support NFSv3, we'll just do NFSv4. */
-    return mount_nfs4(source, target, options, data);
-  }
-#endif
-
 #ifdef ENABLE_DEBUG
   warn("mount_filesystem: not NFS", NULL);
 #endif