From 0715d1b22a6f0008b70fe4b1881045f65521ac19 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 24 Mar 2016 11:33:36 +0100 Subject: Use swapon path as pager partition path When /dev/hd* entries are parted-partition storeio, the store name is only the disk name, thus not unique. We should just use the path being used instead. * sutils/swapon.c (swaponoff): Use `file' instead of `store->name' to default_pager_paging_file. (main): Drop hardcoded "/dev/". * procfs/rootdir.c (rootdir_gc_swaps): Drop hardcoded "/dev/". --- procfs/rootdir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'procfs/rootdir.c') diff --git a/procfs/rootdir.c b/procfs/rootdir.c index 951c071d..8e7c6595 100644 --- a/procfs/rootdir.c +++ b/procfs/rootdir.c @@ -557,7 +557,7 @@ rootdir_gc_swaps (void *hook, char **contents, ssize_t *contents_len) name = names; for (i = 0; i < nfree; i++) { - fprintf (m, "/dev/%s\tpartition\t%zu\t%zu\t-1\n", + fprintf (m, "%s\tpartition\t%zu\t%zu\t-1\n", name, size[i] >> 10, (size[i] - free[i]) >> 10); name = argz_next (names, names_len, name); } -- cgit v1.2.3