chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
catalog: typo fixes
[elogind.git]
/
src
/
remount-fs
/
remount-fs.c
diff --git
a/src/remount-fs/remount-fs.c
b/src/remount-fs/remount-fs.c
index ef68e506e5097da4628acad62cb5af547a800042..b49d095cbb402ea0fbb25909663db45058a8e09c 100644
(file)
--- a/
src/remount-fs/remount-fs.c
+++ b/
src/remount-fs/remount-fs.c
@@
-79,9
+79,10
@@
int main(int argc, char *argv[]) {
int k;
char *s;
int k;
char *s;
- /* Remount the root fs and all API VFS */
+ /* Remount the root fs
, /usr
and all API VFS */
if (!mount_point_is_api(me->mnt_dir) &&
if (!mount_point_is_api(me->mnt_dir) &&
- !path_equal(me->mnt_dir, "/"))
+ !path_equal(me->mnt_dir, "/") &&
+ !path_equal(me->mnt_dir, "/usr"))
continue;
log_debug("Remounting %s", me->mnt_dir);
continue;
log_debug("Remounting %s", me->mnt_dir);
@@
-113,7
+114,7
@@
int main(int argc, char *argv[]) {
s = strdup(me->mnt_dir);
if (!s) {
s = strdup(me->mnt_dir);
if (!s) {
- log_
error("Out of memory."
);
+ log_
oom(
);
ret = EXIT_FAILURE;
continue;
}
ret = EXIT_FAILURE;
continue;
}
@@
-144,7
+145,7
@@
int main(int argc, char *argv[]) {
s = hashmap_remove(pids, UINT_TO_PTR(si.si_pid));
if (s) {
s = hashmap_remove(pids, UINT_TO_PTR(si.si_pid));
if (s) {
- if (!is_clean_exit(si.si_code, si.si_status)) {
+ if (!is_clean_exit(si.si_code, si.si_status
, NULL
)) {
if (si.si_code == CLD_EXITED)
log_error("/bin/mount for %s exited with exit status %i.", s, si.si_status);
else
if (si.si_code == CLD_EXITED)
log_error("/bin/mount for %s exited with exit status %i.", s, si.si_status);
else