Merge pull request #11827 from keszybz/pkgconfig-variables

[thirdparty/systemd.git] / src / fstab-generator / fstab-generator.c

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 5098336abed2e36dd9816a9c7d6716c1f762cefa..30a6d356d0e32d24c94c1b52123efc9094c318a0 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -18,6 +18,7 @@
 #include "mkdir.h"
 #include "mount-setup.h"
 #include "mount-util.h"
+#include "mountpoint-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
@@ -39,8 +40,8 @@ typedef enum MountpointFlags {
         GROWFS    = 1 << 4,
 } MountpointFlags;
 
-static const char *arg_dest = "/tmp";
-static const char *arg_dest_late = "/tmp";
+static const char *arg_dest = NULL;
+static const char *arg_dest_late = NULL;
 static bool arg_fstab_enabled = true;
 static char *arg_root_what = NULL;
 static char *arg_root_fstype = NULL;
@@ -60,7 +61,6 @@ STATIC_DESTRUCTOR_REGISTER(arg_usr_what, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_usr_fstype, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_usr_options, freep);
 
-
 static int write_options(FILE *f, const char *options) {
         _cleanup_free_ char *o = NULL;
 
@@ -518,6 +518,8 @@ static int parse_fstab(bool initrd) {
         int r = 0;
 
         fstab_path = initrd ? "/sysroot/etc/fstab" : "/etc/fstab";
+        log_debug("Parsing %s...", fstab_path);
+
         f = setmntent(fstab_path, "re");
         if (!f) {
                 if (errno == ENOENT)
@@ -538,7 +540,7 @@ static int parse_fstab(bool initrd) {
                 if (!what)
                         return log_oom();
 
-                if (is_device_path(what) && path_is_read_only_fs("sys") > 0) {
+                if (is_device_path(what) && path_is_read_only_fs("/sys") > 0) {
                         log_info("Running in a container, ignoring fstab device entry for %s.", what);
                         continue;
                 }
@@ -571,9 +573,9 @@ static int parse_fstab(bool initrd) {
                 noauto = fstab_test_yes_no_option(me->mnt_opts, "noauto\0" "auto\0");
                 nofail = fstab_test_yes_no_option(me->mnt_opts, "nofail\0" "fail\0");
 
-                log_debug("Found entry what=%s where=%s type=%s makefs=%s nofail=%s noauto=%s",
+                log_debug("Found entry what=%s where=%s type=%s makefs=%s growfs=%s noauto=%s nofail=%s",
                           what, where, me->mnt_type,
-                          yes_no(makefs),
+                          yes_no(makefs), yes_no(growfs),
                           yes_no(noauto), yes_no(nofail));
 
                 if (streq(me->mnt_type, "swap"))
@@ -720,23 +722,14 @@ static int add_sysroot_usr_mount(void) {
 }
 
 static int add_volatile_root(void) {
-        const char *from, *to;
-
-        if (arg_volatile_mode != VOLATILE_YES)
-                return 0;
-
         /* Let's add in systemd-remount-volatile.service which will remount the root device to tmpfs if this is
          * requested, leaving only /usr from the root mount inside. */
 
-        from = strjoina(SYSTEM_DATA_UNIT_PATH "/systemd-volatile-root.service");
-        to = strjoina(arg_dest, "/" SPECIAL_INITRD_ROOT_FS_TARGET, ".requires/systemd-volatile-root.service");
-
-        (void) mkdir_parents(to, 0755);
-
-        if (symlink(from, to) < 0)
-                return log_error_errno(errno, "Failed to hook in volatile remount service: %m");
+        if (arg_volatile_mode != VOLATILE_YES)
+                return 0;
 
-        return 0;
+        return generator_add_symlink(arg_dest, SPECIAL_INITRD_ROOT_FS_TARGET, "requires",
+                                     SYSTEM_DATA_UNIT_PATH "/" SPECIAL_VOLATILE_ROOT_SERVICE);
 }
 
 static int add_volatile_var(void) {
@@ -867,22 +860,11 @@ static int determine_root(void) {
         return 1;
 }
 
-static int run(int argc, char *argv[]) {
-        int r;
-
-        if (argc > 1 && argc != 4) {
-                log_error("This program takes three or no arguments.");
-                return -EINVAL;
-        }
-
-        if (argc > 1)
-                arg_dest = argv[1];
-        if (argc > 3)
-                arg_dest_late = argv[3];
-
-        log_setup_generator();
+static int run(const char *dest, const char *dest_early, const char *dest_late) {
+        int r, r2 = 0, r3 = 0;
 
-        umask(0022);
+        assert_se(arg_dest = dest);
+        assert_se(arg_dest_late = dest_late);
 
         r = proc_cmdline_parse(parse_proc_cmdline_item, NULL, 0);
         if (r < 0)
@@ -892,42 +874,27 @@ static int run(int argc, char *argv[]) {
 
         /* Always honour root= and usr= in the kernel command line if we are in an initrd */
         if (in_initrd()) {
-                int k;
-
                 r = add_sysroot_mount();
 
-                k = add_sysroot_usr_mount();
-                if (k < 0)
-                        r = k;
+                r2 = add_sysroot_usr_mount();
 
-                k = add_volatile_root();
-                if (k < 0)
-                        r = k;
+                r3 = add_volatile_root();
         } else
                 r = add_volatile_var();
 
         /* Honour /etc/fstab only when that's enabled */
         if (arg_fstab_enabled) {
-                int k;
-
-                log_debug("Parsing /etc/fstab");
-
                 /* Parse the local /etc/fstab, possibly from the initrd */
-                k = parse_fstab(false);
-                if (k < 0)
-                        r = k;
+                r2 = parse_fstab(false);
 
                 /* If running in the initrd also parse the /etc/fstab from the host */
-                if (in_initrd()) {
-                        log_debug("Parsing /sysroot/etc/fstab");
-
-                        k = parse_fstab(true);
-                        if (k < 0)
-                                r = k;
-                }
+                if (in_initrd())
+                        r3 = parse_fstab(true);
+                else
+                        r3 = generator_enable_remount_fs_service(arg_dest);
         }
 
-        return r;
+        return r < 0 ? r : r2 < 0 ? r2 : r3;
 }
 
-DEFINE_MAIN_FUNCTION(run);
+DEFINE_MAIN_GENERATOR_FUNCTION(run);