install: make InstallContext::{will_install,have_installed} OrderedHashmaps

[elogind.git] / src / fstab-generator / fstab-generator.c

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 1256a1ce53dfeddecf1d30efb33aed89908b2fcd..32a8f9bd514685432f785619a1715b67e32d8b43 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -43,36 +43,77 @@ static char *arg_root_what = NULL;
 static char *arg_root_fstype = NULL;
 static char *arg_root_options = NULL;
 static int arg_root_rw = -1;
 static char *arg_root_fstype = NULL;
 static char *arg_root_options = NULL;
 static int arg_root_rw = -1;

+static char *arg_usr_what = NULL;
+static char *arg_usr_fstype = NULL;
+static char *arg_usr_options = NULL;

 
 
 static int mount_find_pri(struct mntent *me, int *ret) {
 
 
 static int mount_find_pri(struct mntent *me, int *ret) {

-        char *end, *pri;
+        char *end, *opt;

         unsigned long r;
 
         assert(me);
         assert(ret);
 
         unsigned long r;
 
         assert(me);
         assert(ret);
 

-        pri = hasmntopt(me, "pri");
-        if (!pri)
+        opt = hasmntopt(me, "pri");
+        if (!opt)

                 return 0;
 
                 return 0;
 

-        pri += 4;
+        opt += strlen("pri");
+
+        if (*opt != '=')
+                return -EINVAL;

 
         errno = 0;
 
         errno = 0;

-        r = strtoul(pri, &end, 10);
+        r = strtoul(opt + 1, &end, 10);

         if (errno > 0)
                 return -errno;
 
         if (errno > 0)
                 return -errno;
 

-        if (end == pri || (*end != ',' && *end != 0))
+        if (end == opt + 1 || (*end != ',' && *end != 0))

                 return -EINVAL;
 
         *ret = (int) r;
         return 1;
 }
 
                 return -EINVAL;
 
         *ret = (int) r;
         return 1;
 }
 

+static int mount_find_discard(struct mntent *me, char **ret) {
+        char *opt, *ans;
+        size_t len;
+
+        assert(me);
+        assert(ret);
+
+        opt = hasmntopt(me, "discard");
+        if (!opt)
+                return 0;
+
+        opt += strlen("discard");
+
+        if (*opt == ',' || *opt == '\0')
+                ans = strdup("all");
+        else {
+                if (*opt != '=')
+                        return -EINVAL;
+
+                len = strcspn(opt + 1, ",");
+                if (len == 0)
+                        return -EINVAL;
+
+                ans = strndup(opt + 1, len);
+        }
+
+        if (!ans)
+                return -ENOMEM;
+
+        *ret = ans;
+        return 1;
+}
+

 static int add_swap(const char *what, struct mntent *me) {
         _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL;
         _cleanup_fclose_ FILE *f = NULL;
 static int add_swap(const char *what, struct mntent *me) {
         _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL;
         _cleanup_fclose_ FILE *f = NULL;

+        _cleanup_free_ char *discard = NULL;
+

         bool noauto;
         int r, pri = -1;
 
         bool noauto;
         int r, pri = -1;
 


@@ -87,7 +128,13 @@ static int add_swap(const char *what, struct mntent *me) {
         r = mount_find_pri(me, &pri);
         if (r < 0) {
                 log_error("Failed to parse priority");
         r = mount_find_pri(me, &pri);
         if (r < 0) {
                 log_error("Failed to parse priority");

-                return pri;
+                return r;
+        }
+
+        r = mount_find_discard(me, &discard);
+        if (r < 0) {
+                log_error("Failed to parse discard");
+                return r;

         }
 
         noauto = !!hasmntopt(me, "noauto");
         }
 
         noauto = !!hasmntopt(me, "noauto");


@@ -119,9 +166,10 @@ static int add_swap(const char *what, struct mntent *me) {
                 what);
 
         if (pri >= 0)
                 what);
 
         if (pri >= 0)

-                fprintf(f,
-                        "Priority=%i\n",
-                        pri);
+                fprintf(f, "Priority=%i\n", pri);
+
+        if (discard)
+                fprintf(f, "Discard=%s\n", discard);

 
         fflush(f);
         if (ferror(f)) {
 
         fflush(f);
         if (ferror(f)) {


@@ -432,7 +480,7 @@ static int add_root_mount(void) {
         else if (arg_root_rw >= 0 ||
                  (!mount_test_option(arg_root_options, "ro") &&
                   !mount_test_option(arg_root_options, "rw")))
         else if (arg_root_rw >= 0 ||
                  (!mount_test_option(arg_root_options, "ro") &&
                   !mount_test_option(arg_root_options, "rw")))

-                opts = strappenda3(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro");
+                opts = strappenda(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro");

         else
                 opts = arg_root_options;
 
         else
                 opts = arg_root_options;
 


@@ -449,12 +497,64 @@ static int add_root_mount(void) {
                          "/proc/cmdline");
 }
 
                          "/proc/cmdline");
 }
 

+static int add_usr_mount(void) {
+        _cleanup_free_ char *what = NULL;
+        const char *opts;
+
+        if (!arg_usr_what && !arg_usr_fstype && !arg_usr_options)
+                return 0;
+
+        if (arg_root_what && !arg_usr_what) {
+                arg_usr_what = strdup(arg_root_what);
+
+                if (!arg_usr_what)
+                        return log_oom();
+        }
+
+        if (arg_root_fstype && !arg_usr_fstype) {
+                arg_usr_fstype = strdup(arg_root_fstype);
+
+                if (!arg_usr_fstype)
+                        return log_oom();
+        }
+
+        if (arg_root_options && !arg_usr_options) {
+                arg_usr_options = strdup(arg_root_options);
+
+                if (!arg_usr_options)
+                        return log_oom();
+        }
+
+        if (!arg_usr_what || !arg_usr_options)
+                return 0;
+
+        what = fstab_node_to_udev_node(arg_usr_what);
+        if (!path_is_absolute(what)) {
+                log_debug("Skipping entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype));
+                return -1;
+        }
+
+        opts = arg_usr_options;
+
+        log_debug("Found entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype));
+        return add_mount(what,
+                         "/sysroot/usr",
+                         arg_usr_fstype,
+                         opts,
+                         1,
+                         false,
+                         false,
+                         false,
+                         SPECIAL_INITRD_ROOT_FS_TARGET,
+                         "/proc/cmdline");
+}
+

 static int parse_proc_cmdline_item(const char *key, const char *value) {
         int r;
 
 static int parse_proc_cmdline_item(const char *key, const char *value) {
         int r;
 

-        /* root= and roofstype= may occur more than once, the last
-         * instance should take precedence.  In the case of multiple
-         * rootflags= the arguments should be concatenated */
+        /* root=, usr=, usrfstype= and roofstype= may occur more than once, the last
+         * instance should take precedence.  In the case of multiple rootflags=
+         * or usrflags= the arguments should be concatenated */

 
         if (STR_IN_SET(key, "fstab", "rd.fstab") && value) {
 
 
         if (STR_IN_SET(key, "fstab", "rd.fstab") && value) {
 


@@ -466,16 +566,12 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
 
         } else if (streq(key, "root") && value) {
 
 
         } else if (streq(key, "root") && value) {
 

-                free(arg_root_what);
-                arg_root_what = strdup(value);
-                if (!arg_root_what)
+                if (free_and_strdup(&arg_root_what, value) < 0)

                         return log_oom();
 
         } else if (streq(key, "rootfstype") && value) {
 
                         return log_oom();
 
         } else if (streq(key, "rootfstype") && value) {
 

-                free(arg_root_fstype);
-                arg_root_fstype = strdup(value);
-                if (!arg_root_fstype)
+                if (free_and_strdup(&arg_root_fstype, value) < 0)

                         return log_oom();
 
         } else if (streq(key, "rootflags") && value) {
                         return log_oom();
 
         } else if (streq(key, "rootflags") && value) {


@@ -490,6 +586,28 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
                 free(arg_root_options);
                 arg_root_options = o;
 
                 free(arg_root_options);
                 arg_root_options = o;
 

+        } else if (streq(key, "mount.usr") && value) {
+
+                if (free_and_strdup(&arg_usr_what, value) < 0)
+                        return log_oom();
+
+        } else if (streq(key, "mount.usrfstype") && value) {
+
+                if (free_and_strdup(&arg_usr_fstype, value) < 0)
+                        return log_oom();
+
+        } else if (streq(key, "mount.usrflags") && value) {
+                char *o;
+
+                o = arg_usr_options ?
+                        strjoin(arg_usr_options, ",", value, NULL) :
+                        strdup(value);
+                if (!o)
+                        return log_oom();
+
+                free(arg_usr_options);
+                arg_usr_options = o;
+

         } else if (streq(key, "rw") && !value)
                 arg_root_rw = true;
         else if (streq(key, "ro") && !value)
         } else if (streq(key, "rw") && !value)
                 arg_root_rw = true;
         else if (streq(key, "ro") && !value)


@@ -518,9 +636,12 @@ int main(int argc, char *argv[]) {
         if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
                 return EXIT_FAILURE;
 
         if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
                 return EXIT_FAILURE;
 

-        /* Always honour root= in the kernel command line if we are in an initrd */
-        if (in_initrd())
+        /* Always honour root= and usr= in the kernel command line if we are in an initrd */
+        if (in_initrd()) {

                 r = add_root_mount();
                 r = add_root_mount();

+                if (r == 0)
+                        r = add_usr_mount();
+        }

 
         /* Honour /etc/fstab only when that's enabled */
         if (arg_fstab_enabled) {
 
         /* Honour /etc/fstab only when that's enabled */
         if (arg_fstab_enabled) {


@@ -543,5 +664,7 @@ int main(int argc, char *argv[]) {
                 }
         }
 
                 }
         }
 

+        free(arg_root_what);
+

         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }