chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsck: be verbose when skipping fsck due to missing AC
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index 9d79cd537deca81dd209e5fd1a454a4790caaf40..284fcb94b2d179c82f9921cbe2752cf9df73febf 100644
(file)
--- a/
src/mount.c
+++ b/
src/mount.c
@@
-359,8
+359,8
@@
static int mount_add_device_links(Mount *m) {
return r;
}
return r;
}
- if (p->passno > 0
/*
&&
-
UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM */
) {
+ if (p->passno > 0 &&
+
UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM
) {
char *name;
Unit *fsck;
/* Let's add in the fsck service */
char *name;
Unit *fsck;
/* Let's add in the fsck service */
@@
-1526,7
+1526,7
@@
static int mount_enumerate(Manager *m) {
m->mount_watch.fd = fileno(m->proc_self_mountinfo);
zero(ev);
m->mount_watch.fd = fileno(m->proc_self_mountinfo);
zero(ev);
- ev.events = EPOLL
ERR
;
+ ev.events = EPOLL
PRI
;
ev.data.ptr = &m->mount_watch;
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->mount_watch.fd, &ev) < 0)
ev.data.ptr = &m->mount_watch;
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->mount_watch.fd, &ev) < 0)
@@
-1551,7
+1551,7
@@
void mount_fd_event(Manager *m, int events) {
int r;
assert(m);
int r;
assert(m);
- assert(events
== EPOLLERR
);
+ assert(events
& EPOLLPRI
);
/* The manager calls this for every fd event happening on the
* /proc/self/mountinfo file, which informs us about mounting
/* The manager calls this for every fd event happening on the
* /proc/self/mountinfo file, which informs us about mounting