summaryrefslogtreecommitdiffstats
path: root/sys-utils/umount.c
diff options
context:
space:
mode:
authorKarel Zak2015-10-15 11:53:44 +0200
committerKarel Zak2015-10-15 12:01:48 +0200
commit1cd9d0d7463850ef6b16a78b8a55e56dbf9a8db1 (patch)
tree00d5e1db4f1c5db37f12f223a212d8216b95fa6d /sys-utils/umount.c
parentlibblkid: make XFS Log visible for wipefs (diff)
downloadkernel-qcow2-util-linux-1cd9d0d7463850ef6b16a78b8a55e56dbf9a8db1.tar.gz
kernel-qcow2-util-linux-1cd9d0d7463850ef6b16a78b8a55e56dbf9a8db1.tar.xz
kernel-qcow2-util-linux-1cd9d0d7463850ef6b16a78b8a55e56dbf9a8db1.zip
mount, umount, swapon, fsck, lsblk, findmnt: ignore malformed lines
The libmount provides way how to deal with parsing errors in fstab -- on error callback function is executed and according to the return libmount manipulate with the malformed line, possible are three states: 1/ fatal error; all file ignored (callback rc < 0) 2/ recoverable error; malformed line ignored (callback rc > 0) 3/ ignore the error (callback rc == 0) The 2/ is the default if no callback specified. Unfortunately our utils uses 3/. The correct way is to use 2/. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/umount.c')
-rw-r--r--sys-utils/umount.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index 464c4c87f..1d866fa1a 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -45,7 +45,7 @@ static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)
if (filename)
warnx(_("%s: parse error: ignore entry at line %d."),
filename, line);
- return 0;
+ return 1;
}