README: add SCSI BSG option

[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 6f352d113f20048970f984d3104a33f2e55eb679..6ebe8aa67300016a901171f3c52cd89f18df232c 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -38,22 +38,6 @@
 static const char *arg_dest = "/tmp";
 static bool arg_enabled = true;
 
-static int device_name(const char *path, char **unit) {
-        char *p;
-
-        assert(path);
-
-        if (!is_device_path(path))
-                return 0;
-
-        p = unit_name_from_path(path, ".device");
-        if (!p)
-                return log_oom();
-
-        *unit = p;
-        return 1;
-}
-
 static int mount_find_pri(struct mntent *me, int *ret) {
         char *end, *pri;
         unsigned long r;
@@ -82,7 +66,6 @@ static int mount_find_pri(struct mntent *me, int *ret) {
 static int add_swap(const char *what, struct mntent *me) {
         _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL;
         _cleanup_fclose_ FILE *f = NULL;
-        bool noauto, nofail;
         int r, pri = -1;
 
         assert(what);
@@ -94,9 +77,6 @@ static int add_swap(const char *what, struct mntent *me) {
                 return pri;
         }
 
-        noauto = !!hasmntopt(me, "noauto");
-        nofail = !!hasmntopt(me, "nofail");
-
         name = unit_name_from_path(what, ".swap");
         if (!name)
                 return log_oom();
@@ -114,14 +94,10 @@ static int add_swap(const char *what, struct mntent *me) {
                 return -errno;
         }
 
-        fputs("# Automatically generated by systemd-fstab-generator\n\n"
-              "[Unit]\n"
-              "SourcePath=/etc/fstab\n", f);
-
-        if (!noauto && !nofail)
-                fputs("Before=" SPECIAL_SWAP_TARGET "\n", f);
-
         fprintf(f,
+                "# Automatically generated by systemd-fstab-generator\n\n"
+                "[Unit]\n"
+                "SourcePath=/etc/fstab\n"
                 "\n"
                 "[Swap]\n"
                 "What=%s\n",
@@ -138,48 +114,9 @@ static int add_swap(const char *what, struct mntent *me) {
                 return -errno;
         }
 
-        if (!noauto) {
-                lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
-                if (!lnk)
-                        return log_oom();
-
-                mkdir_parents_label(lnk, 0755);
-                if (symlink(unit, lnk) < 0) {
-                        log_error("Failed to create symlink %s: %m", lnk);
-                        return -errno;
-                }
-
-                r = device_name(what, &device);
-                if (r < 0)
-                        return r;
-
-                if (r > 0) {
-                        free(lnk);
-                        lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
-                        if (!lnk)
-                                return log_oom();
-
-                        mkdir_parents_label(lnk, 0755);
-                        if (symlink(unit, lnk) < 0) {
-                                log_error("Failed to create symlink %s: %m", lnk);
-                                return -errno;
-                        }
-                }
-        }
-
         return 0;
 }
 
-static bool mount_is_bind(struct mntent *me) {
-        assert(me);
-
-        return
-                hasmntopt(me, "bind") ||
-                streq(me->mnt_type, "bind") ||
-                hasmntopt(me, "rbind") ||
-                streq(me->mnt_type, "rbind");
-}
-
 static bool mount_is_network(struct mntent *me) {
         assert(me);
 
@@ -205,14 +142,12 @@ static int add_mount(
                 bool noauto,
                 bool nofail,
                 bool automount,
-                bool isbind,
                 const char *post,
                 const char *source) {
         _cleanup_free_ char
                 *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
                 *automount_name = NULL, *automount_unit = NULL;
         _cleanup_fclose_ FILE *f = NULL;
-        int r;
 
         assert(what);
         assert(where);
@@ -296,27 +231,6 @@ static int add_mount(
                                 return -errno;
                         }
                 }
-
-                if (!isbind &&
-                    !path_equal(where, "/")) {
-
-                        r = device_name(what, &device);
-                        if (r < 0)
-                                return r;
-
-                        if (r > 0) {
-                                free(lnk);
-                                lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
-                                if (!lnk)
-                                        return log_oom();
-
-                                mkdir_parents_label(lnk, 0755);
-                                if (symlink(unit, lnk) < 0) {
-                                        log_error("Failed to create symlink %s: %m", lnk);
-                                        return -errno;
-                                }
-                        }
-                }
         }
 
         if (automount && !path_equal(where, "/")) {
@@ -413,7 +327,7 @@ static int parse_fstab(const char *prefix, bool initrd) {
                 if (streq(me->mnt_type, "swap"))
                         k = add_swap(what, me);
                 else {
-                        bool noauto, nofail, automount, isbind;
+                        bool noauto, nofail, automount;
                         const char *post;
 
                         noauto = !!hasmntopt(me, "noauto");
@@ -421,7 +335,6 @@ static int parse_fstab(const char *prefix, bool initrd) {
                         automount =
                                   hasmntopt(me, "comment=systemd.automount") ||
                                   hasmntopt(me, "x-systemd.automount");
-                        isbind = mount_is_bind(me);
 
                         if (initrd) {
                                 post = SPECIAL_INITRD_FS_TARGET;
@@ -435,7 +348,7 @@ static int parse_fstab(const char *prefix, bool initrd) {
 
                         k = add_mount(what, where, me->mnt_type, me->mnt_opts,
                                       me->mnt_passno, noauto, nofail, automount,
-                                      isbind, post, fstab_path);
+                                      post, fstab_path);
                 }
 
                 if (k < 0)
@@ -523,7 +436,7 @@ static int parse_new_root_from_proc_cmdline(void) {
 
         log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
         r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false,
-                      false, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
+                      SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
 
         return (r < 0) ? r : 0;
 }