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>
This commit is contained in:
parent
d5b7d2912a
commit
1cd9d0d746
|
@ -471,7 +471,7 @@ static int parser_errcb(struct libmnt_table *tb __attribute__ ((__unused__)),
|
|||
const char *filename, int line)
|
||||
{
|
||||
warnx(_("%s: parse error at line %d -- ignore"), filename, line);
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -805,7 +805,7 @@ static int parser_errcb(struct libmnt_table *tb __attribute__ ((__unused__)),
|
|||
const char *filename, int line)
|
||||
{
|
||||
warnx(_("%s: parse error at line %d"), filename, line);
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static char **append_tabfile(char **files, int *nfiles, char *filename)
|
||||
|
|
|
@ -426,6 +426,15 @@ static char *get_device_path(struct blkdev_cxt *cxt)
|
|||
return xstrdup(path);
|
||||
}
|
||||
|
||||
static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)),
|
||||
const char *filename, int line)
|
||||
{
|
||||
if (filename)
|
||||
warnx(_("%s: parse error: ignore entry at line %d."),
|
||||
filename, line);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int is_active_swap(const char *filename)
|
||||
{
|
||||
if (!swaps) {
|
||||
|
@ -435,6 +444,7 @@ static int is_active_swap(const char *filename)
|
|||
if (!mntcache)
|
||||
mntcache = mnt_new_cache();
|
||||
|
||||
mnt_table_set_parser_errcb(swaps, table_parser_errcb);
|
||||
mnt_table_set_cache(swaps, mntcache);
|
||||
mnt_table_parse_swaps(swaps, NULL);
|
||||
}
|
||||
|
@ -457,6 +467,7 @@ static char *get_device_mountpoint(struct blkdev_cxt *cxt)
|
|||
if (!mntcache)
|
||||
mntcache = mnt_new_cache();
|
||||
|
||||
mnt_table_set_parser_errcb(mtab, table_parser_errcb);
|
||||
mnt_table_set_cache(mtab, mntcache);
|
||||
mnt_table_parse_mtab(mtab, NULL);
|
||||
}
|
||||
|
|
|
@ -101,7 +101,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;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -12,12 +12,22 @@ static struct libmnt_table *swaps, *fstab;
|
|||
|
||||
struct libmnt_cache *mntcache;
|
||||
|
||||
static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)),
|
||||
const char *filename, int line)
|
||||
{
|
||||
if (filename)
|
||||
warnx(_("%s: parse error: ignore entry at line %d."),
|
||||
filename, line);
|
||||
return 1;
|
||||
}
|
||||
|
||||
struct libmnt_table *get_fstab(void)
|
||||
{
|
||||
if (!fstab) {
|
||||
fstab = mnt_new_table();
|
||||
if (!fstab)
|
||||
return NULL;
|
||||
mnt_table_set_parser_errcb(fstab, table_parser_errcb);
|
||||
mnt_table_set_cache(fstab, mntcache);
|
||||
if (mnt_table_parse_fstab(fstab, NULL) != 0)
|
||||
return NULL;
|
||||
|
@ -33,6 +43,7 @@ struct libmnt_table *get_swaps(void)
|
|||
if (!swaps)
|
||||
return NULL;
|
||||
mnt_table_set_cache(swaps, mntcache);
|
||||
mnt_table_set_parser_errcb(swaps, table_parser_errcb);
|
||||
if (mnt_table_parse_swaps(swaps, NULL) != 0)
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue