Merge pull request #8452 from keszybz/use-libmount-more
Use libmount in systemd-shutdown, add tests
This commit is contained in:
Lennart Poettering
GitHub
commit
8c637fe242
|
|
@ -2390,6 +2390,7 @@ executable('systemd-shutdown',
|
|||
systemd_shutdown_sources,
|
||||
include_directories : includes,
|
||||
link_with : [libshared],
|
||||
dependencies : [libmount],
|
||||
install_rpath : rootlibexecdir,
|
||||
install : true,
|
||||
install_dir : rootlibexecdir)
|
||||
|
|
|
|||
|
|
@ -1608,11 +1608,8 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
|
|||
assert(m);
|
||||
|
||||
t = mnt_new_table();
|
||||
if (!t)
|
||||
return log_oom();
|
||||
|
||||
i = mnt_new_iter(MNT_ITER_FORWARD);
|
||||
if (!i)
|
||||
if (!t || !i)
|
||||
return log_oom();
|
||||
|
||||
r = mnt_table_parse_mtab(t, NULL);
|
||||
|
|
@ -1621,9 +1618,9 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
|
|||
|
||||
r = 0;
|
||||
for (;;) {
|
||||
struct libmnt_fs *fs;
|
||||
const char *device, *path, *options, *fstype;
|
||||
_cleanup_free_ char *d = NULL, *p = NULL;
|
||||
struct libmnt_fs *fs;
|
||||
int k;
|
||||
|
||||
k = mnt_table_next_fs(t, i, &fs);
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@
|
|||
#include <sys/mount.h>
|
||||
#include <sys/swap.h>
|
||||
|
||||
/* This needs to be after sys/mount.h :( */
|
||||
#include <libmount.h>
|
||||
|
||||
#include "libudev.h"
|
||||
|
||||
#include "alloc-util.h"
|
||||
|
|
@ -34,7 +37,6 @@
|
|||
#include "fd-util.h"
|
||||
#include "fstab-util.h"
|
||||
#include "linux-3.13/dm-ioctl.h"
|
||||
#include "list.h"
|
||||
#include "mount-setup.h"
|
||||
#include "mount-util.h"
|
||||
#include "path-util.h"
|
||||
|
|
@ -46,14 +48,8 @@
|
|||
#include "util.h"
|
||||
#include "virt.h"
|
||||
|
||||
typedef struct MountPoint {
|
||||
char *path;
|
||||
char *remount_options;
|
||||
unsigned long remount_flags;
|
||||
bool try_remount_ro;
|
||||
dev_t devnum;
|
||||
LIST_FIELDS(struct MountPoint, mount_point);
|
||||
} MountPoint;
|
||||
DEFINE_TRIVIAL_CLEANUP_FUNC(struct libmnt_table*, mnt_free_table);
|
||||
DEFINE_TRIVIAL_CLEANUP_FUNC(struct libmnt_iter*, mnt_free_iter);
|
||||
|
||||
static void mount_point_free(MountPoint **head, MountPoint *m) {
|
||||
assert(head);
|
||||
|
|
@ -66,54 +62,53 @@ static void mount_point_free(MountPoint **head, MountPoint *m) {
|
|||
free(m);
|
||||
}
|
||||
|
||||
static void mount_points_list_free(MountPoint **head) {
|
||||
void mount_points_list_free(MountPoint **head) {
|
||||
assert(head);
|
||||
|
||||
while (*head)
|
||||
mount_point_free(head, *head);
|
||||
}
|
||||
|
||||
static int mount_points_list_get(MountPoint **head) {
|
||||
_cleanup_fclose_ FILE *proc_self_mountinfo = NULL;
|
||||
unsigned int i;
|
||||
int mount_points_list_get(const char *mountinfo, MountPoint **head) {
|
||||
_cleanup_(mnt_free_tablep) struct libmnt_table *t = NULL;
|
||||
_cleanup_(mnt_free_iterp) struct libmnt_iter *i = NULL;
|
||||
int r;
|
||||
|
||||
assert(head);
|
||||
|
||||
proc_self_mountinfo = fopen("/proc/self/mountinfo", "re");
|
||||
if (!proc_self_mountinfo)
|
||||
return -errno;
|
||||
t = mnt_new_table();
|
||||
i = mnt_new_iter(MNT_ITER_FORWARD);
|
||||
if (!t || !i)
|
||||
return log_oom();
|
||||
|
||||
for (i = 1;; i++) {
|
||||
_cleanup_free_ char *path = NULL, *options = NULL, *flags = NULL, *type = NULL, *p = NULL;
|
||||
r = mnt_table_parse_mtab(t, mountinfo);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to parse %s: %m", mountinfo);
|
||||
|
||||
for (;;) {
|
||||
struct libmnt_fs *fs;
|
||||
const char *path, *options, *fstype;
|
||||
_cleanup_free_ char *d = NULL, *p = NULL;
|
||||
unsigned long remount_flags = 0u;
|
||||
_cleanup_free_ char *remount_options = NULL;
|
||||
bool try_remount_ro;
|
||||
MountPoint *m;
|
||||
int k;
|
||||
|
||||
k = fscanf(proc_self_mountinfo,
|
||||
"%*s " /* (1) mount id */
|
||||
"%*s " /* (2) parent id */
|
||||
"%*s " /* (3) major:minor */
|
||||
"%*s " /* (4) root */
|
||||
"%ms " /* (5) mount point */
|
||||
"%ms" /* (6) mount flags */
|
||||
"%*[^-]" /* (7) optional fields */
|
||||
"- " /* (8) separator */
|
||||
"%ms " /* (9) file system type */
|
||||
"%*s" /* (10) mount source */
|
||||
"%ms" /* (11) mount options */
|
||||
"%*[^\n]", /* some rubbish at the end */
|
||||
&path, &flags, &type, &options);
|
||||
if (k != 4) {
|
||||
if (k == EOF)
|
||||
break;
|
||||
|
||||
log_warning("Failed to parse /proc/self/mountinfo:%u.", i);
|
||||
continue;
|
||||
}
|
||||
|
||||
r = cunescape(path, UNESCAPE_RELAX, &p);
|
||||
r = mnt_table_next_fs(t, i, &fs);
|
||||
if (r == 1)
|
||||
break;
|
||||
if (r < 0)
|
||||
return r;
|
||||
return log_error_errno(r, "Failed to get next entry from %s: %m", mountinfo);
|
||||
|
||||
path = mnt_fs_get_target(fs);
|
||||
if (!path)
|
||||
continue;
|
||||
|
||||
if (cunescape(path, UNESCAPE_RELAX, &p) < 0)
|
||||
return log_oom();
|
||||
|
||||
options = mnt_fs_get_options(fs);
|
||||
fstype = mnt_fs_get_fstype(fs);
|
||||
|
||||
/* Ignore mount points we can't unmount because they
|
||||
* are API or because we are keeping them open (like
|
||||
|
|
@ -129,11 +124,6 @@ static int mount_points_list_get(MountPoint **head) {
|
|||
path_startswith(p, "/proc"))
|
||||
continue;
|
||||
|
||||
m = new0(MountPoint, 1);
|
||||
if (!m)
|
||||
return -ENOMEM;
|
||||
|
||||
free_and_replace(m->path, p);
|
||||
|
||||
/* If we are in a container, don't attempt to
|
||||
* read-only mount anything as that brings no real
|
||||
|
|
@ -145,79 +135,84 @@ static int mount_points_list_get(MountPoint **head) {
|
|||
* a "dirty fs") and could hang if the network is down.
|
||||
* Note that umount2() is more careful and will not
|
||||
* hang because of the network being down. */
|
||||
m->try_remount_ro = detect_container() <= 0 &&
|
||||
!fstype_is_network(type) &&
|
||||
!fstype_is_api_vfs(type) &&
|
||||
!fstype_is_ro(type) &&
|
||||
!fstab_test_yes_no_option(options, "ro\0rw\0");
|
||||
|
||||
if (m->try_remount_ro) {
|
||||
_cleanup_free_ char *unknown_flags = NULL;
|
||||
try_remount_ro = detect_container() <= 0 &&
|
||||
!fstype_is_network(fstype) &&
|
||||
!fstype_is_api_vfs(fstype) &&
|
||||
!fstype_is_ro(fstype) &&
|
||||
!fstab_test_yes_no_option(options, "ro\0rw\0");
|
||||
|
||||
if (try_remount_ro) {
|
||||
/* mount(2) states that mount flags and options need to be exactly the same
|
||||
* as they were when the filesystem was mounted, except for the desired
|
||||
* changes. So we reconstruct both here and adjust them for the later
|
||||
* remount call too. */
|
||||
|
||||
r = mount_option_mangle(flags, 0, &m->remount_flags, &unknown_flags);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (!isempty(unknown_flags))
|
||||
log_warning("Ignoring unknown mount flags '%s'.", unknown_flags);
|
||||
r = mnt_fs_get_propagation(fs, &remount_flags);
|
||||
if (r < 0) {
|
||||
log_warning_errno(r, "mnt_fs_get_propagation() failed for %s, ignoring: %m", path);
|
||||
continue;
|
||||
}
|
||||
|
||||
r = mount_option_mangle(options, m->remount_flags, &m->remount_flags, &m->remount_options);
|
||||
if (r < 0)
|
||||
return r;
|
||||
r = mount_option_mangle(options, remount_flags, &remount_flags, &remount_options);
|
||||
if (r < 0) {
|
||||
log_warning_errno(r, "mount_option_mangle failed for %s, ignoring: %m", path);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* MS_BIND is special. If it is provided it will only make the mount-point
|
||||
* read-only. If left out, the super block itself is remounted, which we want. */
|
||||
m->remount_flags = (m->remount_flags|MS_REMOUNT|MS_RDONLY) & ~MS_BIND;
|
||||
remount_flags = (remount_flags|MS_REMOUNT|MS_RDONLY) & ~MS_BIND;
|
||||
}
|
||||
|
||||
m = new0(MountPoint, 1);
|
||||
if (!m)
|
||||
return log_oom();
|
||||
|
||||
free_and_replace(m->path, p);
|
||||
free_and_replace(m->remount_options, remount_options);
|
||||
m->remount_flags = remount_flags;
|
||||
m->try_remount_ro = try_remount_ro;
|
||||
|
||||
LIST_PREPEND(mount_point, *head, m);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int swap_list_get(MountPoint **head) {
|
||||
_cleanup_fclose_ FILE *proc_swaps = NULL;
|
||||
unsigned int i;
|
||||
int swap_list_get(const char *swaps, MountPoint **head) {
|
||||
_cleanup_(mnt_free_tablep) struct libmnt_table *t = NULL;
|
||||
_cleanup_(mnt_free_iterp) struct libmnt_iter *i = NULL;
|
||||
int r;
|
||||
|
||||
assert(head);
|
||||
|
||||
proc_swaps = fopen("/proc/swaps", "re");
|
||||
if (!proc_swaps)
|
||||
return (errno == ENOENT) ? 0 : -errno;
|
||||
t = mnt_new_table();
|
||||
i = mnt_new_iter(MNT_ITER_FORWARD);
|
||||
if (!t || !i)
|
||||
return log_oom();
|
||||
|
||||
(void) fscanf(proc_swaps, "%*s %*s %*s %*s %*s\n");
|
||||
r = mnt_table_parse_swaps(t, swaps);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to parse %s: %m", swaps);
|
||||
|
||||
for (;;) {
|
||||
struct libmnt_fs *fs;
|
||||
|
||||
for (i = 2;; i++) {
|
||||
MountPoint *swap;
|
||||
_cleanup_free_ char *dev = NULL, *d = NULL;
|
||||
int k;
|
||||
const char *source;
|
||||
_cleanup_free_ char *d = NULL;
|
||||
|
||||
k = fscanf(proc_swaps,
|
||||
"%ms " /* device/file */
|
||||
"%*s " /* type of swap */
|
||||
"%*s " /* swap size */
|
||||
"%*s " /* used */
|
||||
"%*s\n", /* priority */
|
||||
&dev);
|
||||
r = mnt_table_next_fs(t, i, &fs);
|
||||
if (r == 1)
|
||||
break;
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to get next entry from %s: %m", swaps);
|
||||
|
||||
if (k != 1) {
|
||||
if (k == EOF)
|
||||
break;
|
||||
|
||||
log_warning("Failed to parse /proc/swaps:%u.", i);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (endswith(dev, " (deleted)"))
|
||||
source = mnt_fs_get_source(fs);
|
||||
if (!source)
|
||||
continue;
|
||||
|
||||
r = cunescape(dev, UNESCAPE_RELAX, &d);
|
||||
r = cunescape(source, UNESCAPE_RELAX, &d);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
@ -266,10 +261,9 @@ static int loopback_list_get(MountPoint **head) {
|
|||
|
||||
first = udev_enumerate_get_list_entry(e);
|
||||
udev_list_entry_foreach(item, first) {
|
||||
MountPoint *lb;
|
||||
_cleanup_udev_device_unref_ struct udev_device *d;
|
||||
char *loop;
|
||||
const char *dn;
|
||||
_cleanup_free_ MountPoint *lb = NULL;
|
||||
|
||||
d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
|
||||
if (!d)
|
||||
|
|
@ -279,18 +273,16 @@ static int loopback_list_get(MountPoint **head) {
|
|||
if (!dn)
|
||||
continue;
|
||||
|
||||
loop = strdup(dn);
|
||||
if (!loop)
|
||||
return -ENOMEM;
|
||||
|
||||
lb = new0(MountPoint, 1);
|
||||
if (!lb) {
|
||||
free(loop);
|
||||
if (!lb)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
lb->path = loop;
|
||||
r = free_and_strdup(&lb->path, dn);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
LIST_PREPEND(mount_point, *head, lb);
|
||||
lb = NULL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -326,11 +318,10 @@ static int dm_list_get(MountPoint **head) {
|
|||
|
||||
first = udev_enumerate_get_list_entry(e);
|
||||
udev_list_entry_foreach(item, first) {
|
||||
MountPoint *m;
|
||||
_cleanup_udev_device_unref_ struct udev_device *d;
|
||||
dev_t devnum;
|
||||
char *node;
|
||||
const char *dn;
|
||||
_cleanup_free_ MountPoint *m = NULL;
|
||||
|
||||
d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
|
||||
if (!d)
|
||||
|
|
@ -341,19 +332,17 @@ static int dm_list_get(MountPoint **head) {
|
|||
if (major(devnum) == 0 || !dn)
|
||||
continue;
|
||||
|
||||
node = strdup(dn);
|
||||
if (!node)
|
||||
m = new0(MountPoint, 1);
|
||||
if (!m)
|
||||
return -ENOMEM;
|
||||
|
||||
m = new(MountPoint, 1);
|
||||
if (!m) {
|
||||
free(node);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
m->path = node;
|
||||
m->devnum = devnum;
|
||||
r = free_and_strdup(&m->path, dn);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
LIST_PREPEND(mount_point, *head, m);
|
||||
m = NULL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -647,21 +636,16 @@ static int dm_points_list_detach(MountPoint **head, bool *changed, int umount_lo
|
|||
|
||||
static int umount_all_once(bool *changed, int umount_log_level) {
|
||||
int r;
|
||||
LIST_HEAD(MountPoint, mp_list_head);
|
||||
_cleanup_(mount_points_list_free) LIST_HEAD(MountPoint, mp_list_head);
|
||||
|
||||
assert(changed);
|
||||
|
||||
LIST_HEAD_INIT(mp_list_head);
|
||||
r = mount_points_list_get(&mp_list_head);
|
||||
r = mount_points_list_get(NULL, &mp_list_head);
|
||||
if (r < 0)
|
||||
goto end;
|
||||
return r;
|
||||
|
||||
r = mount_points_list_umount(&mp_list_head, changed, umount_log_level);
|
||||
|
||||
end:
|
||||
mount_points_list_free(&mp_list_head);
|
||||
|
||||
return r;
|
||||
return mount_points_list_umount(&mp_list_head, changed, umount_log_level);
|
||||
}
|
||||
|
||||
int umount_all(bool *changed, int umount_log_level) {
|
||||
|
|
@ -685,28 +669,23 @@ int umount_all(bool *changed, int umount_log_level) {
|
|||
}
|
||||
|
||||
int swapoff_all(bool *changed) {
|
||||
_cleanup_(mount_points_list_free) LIST_HEAD(MountPoint, swap_list_head);
|
||||
int r;
|
||||
LIST_HEAD(MountPoint, swap_list_head);
|
||||
|
||||
assert(changed);
|
||||
|
||||
LIST_HEAD_INIT(swap_list_head);
|
||||
|
||||
r = swap_list_get(&swap_list_head);
|
||||
r = swap_list_get(NULL, &swap_list_head);
|
||||
if (r < 0)
|
||||
goto end;
|
||||
return r;
|
||||
|
||||
r = swap_points_list_off(&swap_list_head, changed);
|
||||
|
||||
end:
|
||||
mount_points_list_free(&swap_list_head);
|
||||
|
||||
return r;
|
||||
return swap_points_list_off(&swap_list_head, changed);
|
||||
}
|
||||
|
||||
int loopback_detach_all(bool *changed, int umount_log_level) {
|
||||
_cleanup_(mount_points_list_free) LIST_HEAD(MountPoint, loopback_list_head);
|
||||
int r;
|
||||
LIST_HEAD(MountPoint, loopback_list_head);
|
||||
|
||||
assert(changed);
|
||||
|
||||
|
|
@ -714,19 +693,14 @@ int loopback_detach_all(bool *changed, int umount_log_level) {
|
|||
|
||||
r = loopback_list_get(&loopback_list_head);
|
||||
if (r < 0)
|
||||
goto end;
|
||||
return r;
|
||||
|
||||
r = loopback_points_list_detach(&loopback_list_head, changed, umount_log_level);
|
||||
|
||||
end:
|
||||
mount_points_list_free(&loopback_list_head);
|
||||
|
||||
return r;
|
||||
return loopback_points_list_detach(&loopback_list_head, changed, umount_log_level);
|
||||
}
|
||||
|
||||
int dm_detach_all(bool *changed, int umount_log_level) {
|
||||
_cleanup_(mount_points_list_free) LIST_HEAD(MountPoint, dm_list_head);
|
||||
int r;
|
||||
LIST_HEAD(MountPoint, dm_list_head);
|
||||
|
||||
assert(changed);
|
||||
|
||||
|
|
@ -734,12 +708,7 @@ int dm_detach_all(bool *changed, int umount_log_level) {
|
|||
|
||||
r = dm_list_get(&dm_list_head);
|
||||
if (r < 0)
|
||||
goto end;
|
||||
return r;
|
||||
|
||||
r = dm_points_list_detach(&dm_list_head, changed, umount_log_level);
|
||||
|
||||
end:
|
||||
mount_points_list_free(&dm_list_head);
|
||||
|
||||
return r;
|
||||
return dm_points_list_detach(&dm_list_head, changed, umount_log_level);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "list.h"
|
||||
|
||||
int umount_all(bool *changed, int umount_log_level);
|
||||
|
||||
int swapoff_all(bool *changed);
|
||||
|
|
@ -27,3 +29,17 @@ int swapoff_all(bool *changed);
|
|||
int loopback_detach_all(bool *changed, int umount_log_level);
|
||||
|
||||
int dm_detach_all(bool *changed, int umount_log_level);
|
||||
|
||||
/* This is exported just for testing */
|
||||
typedef struct MountPoint {
|
||||
char *path;
|
||||
char *remount_options;
|
||||
unsigned long remount_flags;
|
||||
bool try_remount_ro;
|
||||
dev_t devnum;
|
||||
LIST_FIELDS(struct MountPoint, mount_point);
|
||||
} MountPoint;
|
||||
|
||||
int mount_points_list_get(const char *mountinfo, MountPoint **head);
|
||||
void mount_points_list_free(MountPoint **head);
|
||||
int swap_list_get(const char *swaps, MountPoint **head);
|
||||
|
|
|
|||
|
|
@ -652,6 +652,14 @@ tests += [
|
|||
[],
|
||||
[libdl],
|
||||
'', 'manual'],
|
||||
|
||||
[['src/test/test-umount.c',
|
||||
'src/core/mount-setup.c',
|
||||
'src/core/mount-setup.h',
|
||||
'src/core/umount.c',
|
||||
'src/core/umount.h'],
|
||||
[],
|
||||
[libmount]],
|
||||
]
|
||||
|
||||
############################################################
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
|
||||
#include "log.h"
|
||||
#include "string-util.h"
|
||||
#include "tests.h"
|
||||
#include "umount.h"
|
||||
#include "util.h"
|
||||
|
||||
static void test_mount_points_list(const char *fname) {
|
||||
_cleanup_(mount_points_list_free) LIST_HEAD(MountPoint, mp_list_head);
|
||||
MountPoint *m;
|
||||
|
||||
log_info("/* %s(\"%s\") */", __func__, fname ?: "/proc/self/mountinfo");
|
||||
|
||||
LIST_HEAD_INIT(mp_list_head);
|
||||
assert_se(mount_points_list_get(fname, &mp_list_head) >= 0);
|
||||
|
||||
LIST_FOREACH(mount_point, m, mp_list_head)
|
||||
log_debug("path=%s o=%s f=0x%lx try-ro=%s dev=%u:%u",
|
||||
m->path,
|
||||
strempty(m->remount_options),
|
||||
m->remount_flags,
|
||||
yes_no(m->try_remount_ro),
|
||||
major(m->devnum), minor(m->devnum));
|
||||
}
|
||||
|
||||
static void test_swap_list(const char *fname) {
|
||||
_cleanup_(mount_points_list_free) LIST_HEAD(MountPoint, mp_list_head);
|
||||
MountPoint *m;
|
||||
|
||||
log_info("/* %s(\"%s\") */", __func__, fname ?: "/proc/swaps");
|
||||
|
||||
LIST_HEAD_INIT(mp_list_head);
|
||||
assert_se(swap_list_get(fname, &mp_list_head) >= 0);
|
||||
|
||||
LIST_FOREACH(mount_point, m, mp_list_head)
|
||||
log_debug("path=%s o=%s f=0x%lx try-ro=%s dev=%u:%u",
|
||||
m->path,
|
||||
strempty(m->remount_options),
|
||||
m->remount_flags,
|
||||
yes_no(m->try_remount_ro),
|
||||
major(m->devnum), minor(m->devnum));
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
log_set_max_level(LOG_DEBUG);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
|
||||
test_mount_points_list(NULL);
|
||||
test_mount_points_list(get_testdata_dir("/test-umount/empty.mountinfo"));
|
||||
test_mount_points_list(get_testdata_dir("/test-umount/garbled.mountinfo"));
|
||||
test_mount_points_list(get_testdata_dir("/test-umount/rhbug-1554943.mountinfo"));
|
||||
|
||||
test_swap_list(NULL);
|
||||
test_swap_list(get_testdata_dir("/test-umount/example.swaps"));
|
||||
}
|
||||
|
|
@ -174,6 +174,10 @@ test_data_files = '''
|
|||
testsuite.target
|
||||
timers.target
|
||||
unstoppable.service
|
||||
test-umount/empty.mountinfo
|
||||
test-umount/garbled.mountinfo
|
||||
test-umount/rhbug-1554943.mountinfo
|
||||
test-umount/example.swaps
|
||||
'''.split()
|
||||
|
||||
if conf.get('ENABLE_RESOLVE') == 1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
Filename Type Size Used Priority
|
||||
/dev/dm-2 partition 8151036 2283436 -2
|
||||
/some/swapfile file 111 111 0
|
||||
/some/swapfile2 (deleted) file 111 111 0
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
18 63 1000999:110999 / /sys rw,nosuid,nodev,noexec,relatime shared:2 - sysfs sysfs rw
|
||||
44 44
|
||||
asdfasdf asdfasdf asdf asdfasdfasdf
|
||||
asdfsadfasd
|
||||
95 63 8:1 / /one-good-entry rw,relatime shared:34 - ext4 /dev/sda1 rw,data=ordered
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
18 63 0:18 / /sys rw,nosuid,nodev,noexec,relatime shared:2 - sysfs sysfs rw
|
||||
19 63 0:4 / /proc rw,nosuid,nodev,noexec,relatime shared:23 - proc proc rw
|
||||
20 63 0:6 / /dev rw,nosuid shared:19 - devtmpfs devtmpfs rw,size=3549752k,nr_inodes=887438,mode=755
|
||||
21 18 0:7 / /sys/kernel/security rw,nosuid,nodev,noexec,relatime shared:3 - securityfs securityfs rw
|
||||
22 20 0:19 / /dev/shm rw,nosuid,nodev shared:20 - tmpfs tmpfs rw
|
||||
23 20 0:20 / /dev/pts rw,nosuid,noexec,relatime shared:21 - devpts devpts rw,gid=5,mode=620,ptmxmode=000
|
||||
24 63 0:21 / /run rw,nosuid,nodev shared:22 - tmpfs tmpfs rw,mode=755
|
||||
25 18 0:22 / /sys/fs/cgroup ro,nosuid,nodev,noexec shared:4 - tmpfs tmpfs ro,mode=755
|
||||
26 25 0:23 / /sys/fs/cgroup/unified rw,nosuid,nodev,noexec,relatime shared:5 - cgroup2 cgroup rw
|
||||
27 25 0:24 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime shared:6 - cgroup cgroup rw,xattr,name=systemd
|
||||
28 18 0:25 / /sys/fs/pstore rw,nosuid,nodev,noexec,relatime shared:17 - pstore pstore rw
|
||||
29 25 0:26 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:7 - cgroup cgroup rw,cpu,cpuacct
|
||||
30 25 0:27 / /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime shared:8 - cgroup cgroup rw,perf_event
|
||||
31 25 0:28 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:9 - cgroup cgroup rw,freezer
|
||||
32 25 0:29 / /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime shared:10 - cgroup cgroup rw,hugetlb
|
||||
33 25 0:30 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:11 - cgroup cgroup rw,cpuset
|
||||
34 25 0:31 / /sys/fs/cgroup/net_cls,net_prio rw,nosuid,nodev,noexec,relatime shared:12 - cgroup cgroup rw,net_cls,net_prio
|
||||
35 25 0:32 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:13 - cgroup cgroup rw,memory
|
||||
36 25 0:33 / /sys/fs/cgroup/pids rw,nosuid,nodev,noexec,relatime shared:14 - cgroup cgroup rw,pids
|
||||
37 25 0:34 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:15 - cgroup cgroup rw,blkio
|
||||
38 25 0:35 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime shared:16 - cgroup cgroup rw,devices
|
||||
61 18 0:36 / /sys/kernel/config rw,relatime shared:18 - configfs configfs rw
|
||||
63 0 8:17 / / rw,relatime shared:1 - ext4 /dev/sdb1 rw,lazytime,commit=30,inode_readahead_blks=16
|
||||
39 18 0:8 / /sys/kernel/debug rw,relatime shared:24 - debugfs debugfs rw
|
||||
40 20 0:37 / /dev/hugepages rw,relatime shared:25 - hugetlbfs hugetlbfs rw,pagesize=2M
|
||||
41 19 0:38 / /proc/sys/fs/binfmt_misc rw,relatime shared:26 - autofs systemd-1 rw,fd=32,pgrp=1,timeout=0,minproto=5,maxproto=5,direct,pipe_ino=14807
|
||||
42 20 0:17 / /dev/mqueue rw,relatime shared:27 - mqueue mqueue rw
|
||||
43 63 0:39 / /var/www/sessiondata rw,nosuid,noexec,noatime shared:28 - tmpfs tmpfs rw,size=4194304k
|
||||
75 63 0:40 / /usr/share/mysql-test/var rw,noatime shared:29 - tmpfs tmpfs rw,size=4194304k,mode=750,uid=27,gid=27
|
||||
77 63 8:33 / /Volumes/dune rw,relatime shared:30 - ext4 /dev/sdc1 rw,lazytime,commit=30,inode_readahead_blks=16
|
||||
79 63 8:33 /builduser /home/builduser rw,relatime shared:30 - ext4 /dev/sdc1 rw,lazytime,commit=30,inode_readahead_blks=16
|
||||
81 77 0:41 / /Volumes/dune/mysql_data/autotest rw,nosuid,noexec,noatime shared:31 - tmpfs tmpfs rw,size=4194304k,mode=700,uid=27,gid=27
|
||||
83 63 8:33 /.tmp /var/tmp rw,relatime shared:30 - ext4 /dev/sdc1 rw,lazytime,commit=30,inode_readahead_blks=16
|
||||
85 77 0:42 / /Volumes/dune/www-servers/cms/cms/temp rw,nosuid,noexec,noatime shared:32 - tmpfs tmpfs rw,size=4194304k,mode=770,uid=48,gid=48
|
||||
87 77 8:33 /buildserver/autotest /Volumes/dune/www-servers/autotest rw,relatime shared:30 - ext4 /dev/sdc1 rw,lazytime,commit=30,inode_readahead_blks=16
|
||||
89 63 8:33 /.tmp /tmp rw,relatime shared:30 - ext4 /dev/sdc1 rw,lazytime,commit=30,inode_readahead_blks=16
|
||||
91 77 0:43 / /Volumes/dune/www-servers/cms/cms/logs rw,nosuid,noexec,noatime shared:33 - tmpfs tmpfs rw,size=4194304k,mode=770,uid=48,gid=48
|
||||
93 63 8:33 /www-servers/cms /usr/local/sftp-homes/flow/cms rw,relatime shared:30 - ext4 /dev/sdc1 rw,lazytime,commit=30,inode_readahead_blks=16
|
||||
95 63 8:1 / /boot rw,relatime shared:34 - ext4 /dev/sda1 rw,data=ordered
|
||||
97 79 0:44 / /home/builduser/rpmbuild/PHP-PGO/logs rw,nosuid,noatime shared:35 - tmpfs tmpfs rw,size=4194304k,mode=770,uid=5000,gid=5000
|
||||
98 77 0:44 / /Volumes/dune/builduser/rpmbuild/PHP-PGO/logs rw,nosuid,noatime shared:35 - tmpfs tmpfs rw,size=4194304k,mode=770,uid=5000,gid=5000
|
||||
101 63 9:0 / /mnt/raid10 rw,relatime shared:36 - ext4 /dev/md0 rw,lazytime,commit=30,stripe=128,inode_readahead_blks=16
|
||||
558 24 0:52 / /run/user/48 rw,nosuid,nodev,relatime shared:83 - tmpfs tmpfs rw,size=711220k,mode=700,uid=48,gid=48
|
||||
588 24 0:53 / /run/user/5000 rw,nosuid,nodev,relatime shared:135 - tmpfs tmpfs rw,size=711220k,mode=700,uid=5000,gid=5000
|
||||
613 24 0:54 / /run/user/4503 rw,nosuid,nodev,relatime shared:85 - tmpfs tmpfs rw,size=711220k,mode=700,uid=4503,gid=4503
|
||||
653 24 0:45 / /run/user/4500 rw,nosuid,nodev,relatime shared:87 - tmpfs tmpfs rw,size=711220k,mode=700,uid=4500,gid=48
|
||||
699 24 0:55 / /run/user/0 rw,nosuid,nodev,relatime shared:89 - tmpfs tmpfs rw,size=711220k,mode=700
|
||||
Loading…
Reference in New Issue