SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: use log_*_errno whenever %m is in the format string

Browse Source 
If the format string contains %m, clearly errno must have a meaningful
value, so we might as well use log_*_errno to have ERRNO= logged.

Using:
find . -name '*.[ch]' | xargs sed -r -i -e \
's/log_(debug|info|notice|warning|error|emergency)\((".*%m.*")/log_\1_errno(errno, \2/'

Plus some whitespace, linewrap, and indent adjustments.
This commit is contained in:
Michal Schmidt
2014-11-28 19:49:27 +01:00
parent 895b3a7b44
commit 56f64d9576
139 changed files with 741 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/switch-root.c
+13 -13
View File
@@ -57,7 +57,7 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,
old_root_remove = in_initrd();
if (stat(new_root, &new_root_stat) < 0) {
log_error("Failed to stat directory %s: %m", new_root);
log_error_errno(errno, "Failed to stat directory %s: %m", new_root);
return -errno;
}
@@ -67,7 +67,7 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,
*
* https://bugzilla.redhat.com/show_bug.cgi?id=847418 */
if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0)
log_warning("Failed to make \"/\" private mount: %m");
log_warning_errno(errno, "Failed to make \"/\" private mount: %m");
NULSTR_FOREACH(i, move_mounts) {
char new_mount[PATH_MAX];
@@ -85,19 +85,19 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,
* stat failed. Unmount the old mount
* point. */
if (umount2(i, MNT_DETACH) < 0)
log_warning("Failed to unmount %s: %m", i);
log_warning_errno(errno, "Failed to unmount %s: %m", i);
continue;
}
if (mount(i, new_mount, NULL, mountflags, NULL) < 0) {
if (mountflags & MS_MOVE) {
log_error("Failed to move mount %s to %s, forcing unmount: %m", i, new_mount);
log_error_errno(errno, "Failed to move mount %s to %s, forcing unmount: %m", i, new_mount);
if (umount2(i, MNT_FORCE) < 0)
log_warning("Failed to unmount %s: %m", i);
log_warning_errno(errno, "Failed to unmount %s: %m", i);
}
if (mountflags & MS_BIND)
log_error("Failed to bind mount %s to %s: %m", i, new_mount);
log_error_errno(errno, "Failed to bind mount %s to %s: %m", i, new_mount);
}
}
@@ -110,14 +110,14 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,
(void) base_filesystem_create(new_root);
if (chdir(new_root) < 0) {
log_error("Failed to change directory to %s: %m", new_root);
log_error_errno(errno, "Failed to change directory to %s: %m", new_root);
return -errno;
}
if (old_root_remove) {
old_root_fd = open("/", O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY|O_DIRECTORY);
if (old_root_fd < 0)
log_warning("Failed to open root directory: %m");
log_warning_errno(errno, "Failed to open root directory: %m");
}
/* We first try a pivot_root() so that we can umount the old
@@ -128,22 +128,22 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,
/* Immediately get rid of the old root, if detach_oldroot is set.
* Since we are running off it we need to do this lazily. */
if (detach_oldroot && umount2(oldroot, MNT_DETACH) < 0)
log_error("Failed to lazily umount old root dir %s, %s: %m",
log_error_errno(errno, "Failed to lazily umount old root dir %s, %s: %m",
oldroot,
errno == ENOENT ? "ignoring" : "leaving it around");
} else if (mount(new_root, "/", NULL, MS_MOVE, NULL) < 0) {
log_error("Failed to mount moving %s to /: %m", new_root);
log_error_errno(errno, "Failed to mount moving %s to /: %m", new_root);
return -errno;
}
if (chroot(".") < 0) {
log_error("Failed to change root: %m");
log_error_errno(errno, "Failed to change root: %m");
return -errno;
}
if (chdir("/") < 0) {
log_error("Failed to change directory: %m");
log_error_errno(errno, "Failed to change directory: %m");
return -errno;
}
@@ -151,7 +151,7 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,
struct stat rb;
if (fstat(old_root_fd, &rb) < 0)
log_warning("Failed to stat old root directory, leaving: %m");
log_warning_errno(errno, "Failed to stat old root directory, leaving: %m");
else {
rm_rf_children(old_root_fd, false, false, &rb);
old_root_fd = -1;