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) &&
- !path_equal(me->mnt_dir, "/"))
+ !path_equal(me->mnt_dir, "/") &&
+ !path_equal(me->mnt_dir, "/usr"))
continue;
log_debug("Remounting %s", me->mnt_dir);
s = strdup(me->mnt_dir);
if (!s) {
- log_error("Out of memory.");
+ log_oom();
ret = EXIT_FAILURE;
continue;
}
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