chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
acl: two tag matching is not going to be available in libudev
[elogind.git]
/
src
/
umount.c
diff --git
a/src/umount.c
b/src/umount.c
index 96ce61da8b1c7d8362b00df10889a0451a241e33..95efa8204b2e9e9cb11e2cf07666d1556251354d 100644
(file)
--- a/
src/umount.c
+++ b/
src/umount.c
@@
-103,9
+103,7
@@
static int mount_points_list_get(MountPoint **head) {
/* If we encounter a bind mount, don't try to remount
* the source dir too early */
/* If we encounter a bind mount, don't try to remount
* the source dir too early */
- if (!streq(root, "/"))
- skip_ro = true;
-
+ skip_ro = !streq(root, "/");
free(root);
p = cunescape(path);
free(root);
p = cunescape(path);
@@
-148,7
+146,7
@@
static int swap_list_get(MountPoint **head) {
assert(head);
if (!(proc_swaps = fopen("/proc/swaps", "re")))
assert(head);
if (!(proc_swaps = fopen("/proc/swaps", "re")))
- return -errno;
+ return
(errno == ENOENT) ? 0 :
-errno;
(void) fscanf(proc_swaps, "%*s %*s %*s %*s %*s\n");
(void) fscanf(proc_swaps, "%*s %*s %*s %*s %*s\n");