|
 |
05ad79 |
From 28663e752e125da99f8636ea0227d168f1e0e6aa Mon Sep 17 00:00:00 2001
|
|
|
05ad79 |
From: Karel Zak <kzak@redhat.com>
|
|
|
05ad79 |
Date: Thu, 15 Oct 2015 11:53:44 +0200
|
|
|
05ad79 |
Subject: [PATCH 62/84] mount, umount, swapon, fsck, lsblk, findmnt: ignore
|
|
|
05ad79 |
malformed lines
|
|
|
05ad79 |
|
|
|
05ad79 |
The libmount provides way how to deal with parsing errors in fstab --
|
|
|
05ad79 |
on error callback function is executed and according to the return
|
|
|
05ad79 |
libmount manipulate with the malformed line, possible are three
|
|
|
05ad79 |
states:
|
|
|
05ad79 |
|
|
|
05ad79 |
1/ fatal error; all file ignored (callback rc < 0)
|
|
|
05ad79 |
2/ recoverable error; malformed line ignored (callback rc > 0)
|
|
|
05ad79 |
3/ ignore the error (callback rc == 0)
|
|
|
05ad79 |
|
|
|
05ad79 |
The 2/ is the default if no callback specified.
|
|
|
05ad79 |
|
|
|
05ad79 |
Unfortunately our utils uses 3/. The correct way is to use 2/.
|
|
|
05ad79 |
|
|
|
05ad79 |
Upstream: http://github.com/karelzak/util-linux/commit/1cd9d0d7463850ef6b16a78b8a55e56dbf9a8db1
|
|
|
05ad79 |
Upstream: http://github.com/karelzak/util-linux/commit/1bb02a2da9f1bf7d80b352d540b29371099ab570
|
|
|
05ad79 |
Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=1271850
|
|
|
05ad79 |
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
|
05ad79 |
---
|
|
|
05ad79 |
disk-utils/fsck.c | 2 +-
|
|
|
05ad79 |
libmount/src/tab_parse.c | 2 +-
|
|
|
05ad79 |
misc-utils/findmnt.c | 2 +-
|
|
|
05ad79 |
misc-utils/lsblk.c | 11 +++++++++++
|
|
|
05ad79 |
sys-utils/mount.c | 2 +-
|
|
|
05ad79 |
sys-utils/swapon-common.c | 11 +++++++++++
|
|
|
05ad79 |
sys-utils/umount.c | 2 +-
|
|
|
05ad79 |
7 files changed, 27 insertions(+), 5 deletions(-)
|
|
|
05ad79 |
|
|
|
05ad79 |
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
|
|
|
05ad79 |
index 6e3a2c0..3ef8e5b 100644
|
|
|
05ad79 |
--- a/disk-utils/fsck.c
|
|
|
05ad79 |
+++ b/disk-utils/fsck.c
|
|
|
05ad79 |
@@ -421,7 +421,7 @@ static int parser_errcb(struct libmnt_table *tb __attribute__ ((__unused__)),
|
|
|
05ad79 |
const char *filename, int line)
|
|
|
05ad79 |
{
|
|
|
05ad79 |
warnx(_("%s: parse error at line %d -- ignore"), filename, line);
|
|
|
05ad79 |
- return 0;
|
|
|
05ad79 |
+ return 1;
|
|
|
05ad79 |
}
|
|
|
05ad79 |
|
|
|
05ad79 |
/*
|
|
|
05ad79 |
diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
|
|
|
05ad79 |
index e930fd8..987e671 100644
|
|
|
05ad79 |
--- a/libmount/src/tab_parse.c
|
|
|
05ad79 |
+++ b/libmount/src/tab_parse.c
|
|
|
05ad79 |
@@ -540,7 +540,7 @@ int mnt_table_parse_stream(struct libmnt_table *tb, FILE *f, const char *filenam
|
|
|
05ad79 |
}
|
|
|
05ad79 |
if (rc) {
|
|
|
05ad79 |
mnt_free_fs(fs);
|
|
|
05ad79 |
- if (rc == 1)
|
|
|
05ad79 |
+ if (rc > 0)
|
|
|
05ad79 |
continue; /* recoverable error */
|
|
|
05ad79 |
if (feof(f))
|
|
|
05ad79 |
break;
|
|
|
05ad79 |
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
|
|
|
05ad79 |
index 615ba08..f16da91 100644
|
|
|
05ad79 |
--- a/misc-utils/findmnt.c
|
|
|
05ad79 |
+++ b/misc-utils/findmnt.c
|
|
|
05ad79 |
@@ -752,7 +752,7 @@ static int parser_errcb(struct libmnt_table *tb __attribute__ ((__unused__)),
|
|
|
05ad79 |
const char *filename, int line)
|
|
|
05ad79 |
{
|
|
|
05ad79 |
warnx(_("%s: parse error at line %d"), filename, line);
|
|
|
05ad79 |
- return 0;
|
|
|
05ad79 |
+ return 1;
|
|
|
05ad79 |
}
|
|
|
05ad79 |
|
|
|
05ad79 |
static char **append_tabfile(char **files, int *nfiles, char *filename)
|
|
|
05ad79 |
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
|
|
|
05ad79 |
index 9e12a90..cd28c1d 100644
|
|
|
05ad79 |
--- a/misc-utils/lsblk.c
|
|
|
05ad79 |
+++ b/misc-utils/lsblk.c
|
|
|
05ad79 |
@@ -337,6 +337,15 @@ static char *get_device_path(struct blkdev_cxt *cxt)
|
|
|
05ad79 |
return xstrdup(path);
|
|
|
05ad79 |
}
|
|
|
05ad79 |
|
|
|
05ad79 |
+static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)),
|
|
|
05ad79 |
+ const char *filename, int line)
|
|
|
05ad79 |
+{
|
|
|
05ad79 |
+ if (filename)
|
|
|
05ad79 |
+ warnx(_("%s: parse error: ignore entry at line %d."),
|
|
|
05ad79 |
+ filename, line);
|
|
|
05ad79 |
+ return 1;
|
|
|
05ad79 |
+}
|
|
|
05ad79 |
+
|
|
|
05ad79 |
static int is_active_swap(const char *filename)
|
|
|
05ad79 |
{
|
|
|
05ad79 |
if (!swaps) {
|
|
|
05ad79 |
@@ -346,6 +355,7 @@ static int is_active_swap(const char *filename)
|
|
|
05ad79 |
if (!mntcache)
|
|
|
05ad79 |
mntcache = mnt_new_cache();
|
|
|
05ad79 |
|
|
|
05ad79 |
+ mnt_table_set_parser_errcb(swaps, table_parser_errcb);
|
|
|
05ad79 |
mnt_table_set_cache(swaps, mntcache);
|
|
|
05ad79 |
mnt_table_parse_swaps(swaps, NULL);
|
|
|
05ad79 |
}
|
|
|
05ad79 |
@@ -368,6 +378,7 @@ static char *get_device_mountpoint(struct blkdev_cxt *cxt)
|
|
|
05ad79 |
if (!mntcache)
|
|
|
05ad79 |
mntcache = mnt_new_cache();
|
|
|
05ad79 |
|
|
|
05ad79 |
+ mnt_table_set_parser_errcb(mtab, table_parser_errcb);
|
|
|
05ad79 |
mnt_table_set_cache(mtab, mntcache);
|
|
|
05ad79 |
mnt_table_parse_mtab(mtab, NULL);
|
|
|
05ad79 |
}
|
|
|
05ad79 |
diff --git a/sys-utils/mount.c b/sys-utils/mount.c
|
|
|
05ad79 |
index 0998b01..f332070 100644
|
|
|
05ad79 |
--- a/sys-utils/mount.c
|
|
|
05ad79 |
+++ b/sys-utils/mount.c
|
|
|
05ad79 |
@@ -101,7 +101,7 @@ static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)
|
|
|
05ad79 |
if (filename)
|
|
|
05ad79 |
warnx(_("%s: parse error: ignore entry at line %d."),
|
|
|
05ad79 |
filename, line);
|
|
|
05ad79 |
- return 0;
|
|
|
05ad79 |
+ return 1;
|
|
|
05ad79 |
}
|
|
|
05ad79 |
|
|
|
05ad79 |
/*
|
|
|
05ad79 |
diff --git a/sys-utils/swapon-common.c b/sys-utils/swapon-common.c
|
|
|
05ad79 |
index 5c95ef3..5f14ddb 100644
|
|
|
05ad79 |
--- a/sys-utils/swapon-common.c
|
|
|
05ad79 |
+++ b/sys-utils/swapon-common.c
|
|
|
05ad79 |
@@ -11,12 +11,22 @@ static struct libmnt_table *swaps, *fstab;
|
|
|
05ad79 |
|
|
|
05ad79 |
struct libmnt_cache *mntcache;
|
|
|
05ad79 |
|
|
|
05ad79 |
+static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)),
|
|
|
05ad79 |
+ const char *filename, int line)
|
|
|
05ad79 |
+{
|
|
|
05ad79 |
+ if (filename)
|
|
|
05ad79 |
+ warnx(_("%s: parse error: ignore entry at line %d."),
|
|
|
05ad79 |
+ filename, line);
|
|
|
05ad79 |
+ return 1;
|
|
|
05ad79 |
+}
|
|
|
05ad79 |
+
|
|
|
05ad79 |
struct libmnt_table *get_fstab(void)
|
|
|
05ad79 |
{
|
|
|
05ad79 |
if (!fstab) {
|
|
|
05ad79 |
fstab = mnt_new_table();
|
|
|
05ad79 |
if (!fstab)
|
|
|
05ad79 |
return NULL;
|
|
|
05ad79 |
+ mnt_table_set_parser_errcb(fstab, table_parser_errcb);
|
|
|
05ad79 |
mnt_table_set_cache(fstab, mntcache);
|
|
|
05ad79 |
if (mnt_table_parse_fstab(fstab, NULL) != 0)
|
|
|
05ad79 |
return NULL;
|
|
|
05ad79 |
@@ -32,6 +42,7 @@ struct libmnt_table *get_swaps(void)
|
|
|
05ad79 |
if (!swaps)
|
|
|
05ad79 |
return NULL;
|
|
|
05ad79 |
mnt_table_set_cache(swaps, mntcache);
|
|
|
05ad79 |
+ mnt_table_set_parser_errcb(swaps, table_parser_errcb);
|
|
|
05ad79 |
if (mnt_table_parse_swaps(swaps, NULL) != 0)
|
|
|
05ad79 |
return NULL;
|
|
|
05ad79 |
}
|
|
|
05ad79 |
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
|
|
|
05ad79 |
index 1bd275f..9c47744 100644
|
|
|
05ad79 |
--- a/sys-utils/umount.c
|
|
|
05ad79 |
+++ b/sys-utils/umount.c
|
|
|
05ad79 |
@@ -45,7 +45,7 @@ static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)
|
|
|
05ad79 |
if (filename)
|
|
|
05ad79 |
warnx(_("%s: parse error: ignore entry at line %d."),
|
|
|
05ad79 |
filename, line);
|
|
|
05ad79 |
- return 0;
|
|
|
05ad79 |
+ return 1;
|
|
|
05ad79 |
}
|
|
|
05ad79 |
|
|
|
05ad79 |
|
|
|
05ad79 |
--
|
|
|
05ad79 |
2.7.4
|
|
|
05ad79 |
|