]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fstab-generator: fix checking of fstab_node_to_udev_node() result
authorLennart Poettering <lennart@poettering.net>
Fri, 24 Jun 2016 19:01:22 +0000 (21:01 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 24 Jun 2016 19:01:22 +0000 (21:01 +0200)
We have to check for OOM here, let's add that. There's really no point in
checking for path_is_absolute() on the result however, as there's no particular
reason why that should be refused. Also, we don't have similar checks for the
other mount devices the generator deals with, hence don't bother with it here
either. Let's remove that check.

(And it shouldn't return made-up errors like "-1" in this case anyway.)

src/fstab-generator/fstab-generator.c

index 62e67e088b2eabb8b941ef67c5625abee94c3d7c..26fccbe360631707ae2999ad77cd490fc78de193 100644 (file)
@@ -570,10 +570,8 @@ static int add_sysroot_usr_mount(void) {
                 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;
-        }
+        if (!what)
+                return log_oom();
 
         if (!arg_usr_options)
                 opts = arg_root_rw > 0 ? "rw" : "ro";