picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Standarize on one spelling of symlink error message

Browse source 
It's polite to print the name of the link that wasn't created,
and it makes little sense to print the target.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-04-22 20:51:29 -04:00
parent fff87a35d9
commit c79bb9e4e2
7 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/mount-setup.c
View file

@ -334,7 +334,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
char **i;
for (i = *k; *i; i++) {
char *t;
_cleanup_free_ char *t;
t = strappend("/sys/fs/cgroup/", *i);
if (!t) {
@ -344,10 +344,8 @@ int mount_cgroup_controllers(char ***join_controllers) {
}
r = symlink(options, t);
free(t);
if (r < 0 && errno != EEXIST) {
log_error("Failed to create symlink: %m");
log_error("Failed to create symlink %s: %m", t);
r = -errno;
free(options);
goto finish;

6
src/cryptsetup/cryptsetup-generator.c
View file

@ -179,7 +179,7 @@ static int create_disk(
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
log_error("Failed to create symlink '%s' to '%s': %m", from, to);
log_error("Failed to create symlink %s: %m", to);
return -errno;
}
@ -193,7 +193,7 @@ static int create_disk(
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
log_error("Failed to create symlink '%s' to '%s': %m", from, to);
log_error("Failed to create symlink %s: %m", to);
return -errno;
}
}
@ -209,7 +209,7 @@ static int create_disk(
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
log_error("Failed to create symlink '%s' to '%s': %m", from, to);
log_error("Failed to create symlink %s: %m", to);
return -errno;
}

2
src/efi-boot-generator/efi-boot-generator.c
View file

@ -115,7 +115,7 @@ int main(int argc, char *argv[]) {
mkdir_parents(name, 0755);
if (symlink("../boot.automount", name) < 0) {
log_error("Failed to create symlink: %m");
log_error("Failed to create symlink %s: %m", name);
return EXIT_FAILURE;
}

2
src/getty-generator/getty-generator.c
View file

@ -55,7 +55,7 @@ static int add_symlink(const char *fservice, const char *tservice) {
/* In case console=hvc0 is passed this will very likely result in EEXIST */
r = 0;
else {
log_error("Failed to create symlink from %s to %s: %m", from, to);
log_error("Failed to create symlink %s: %m", to);
r = -errno;
}
}

2
src/rc-local-generator/rc-local-generator.c
View file

@ -59,7 +59,7 @@ static int add_symlink(const char *service, const char *where) {
if (errno == EEXIST)
r = 0;
else {
log_error("Failed to create symlink from %s to %s: %m", from, to);
log_error("Failed to create symlink %s: %m", to);
r = -errno;
}
}

7
src/system-update-generator/system-update-generator.c
View file

@ -36,7 +36,7 @@ static const char *arg_dest = "/tmp";
static int generate_symlink(void) {
struct stat st;
char *p;
char _cleanup_free_ *p = NULL;
if (lstat("/system-update", &st) < 0) {
if (errno == ENOENT)
@ -51,13 +51,10 @@ static int generate_symlink(void) {
return log_oom();
if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) {
free(p);
log_error("Failed to create symlink: %m");
log_error("Failed to create symlink %s: %m", p);
return -errno;
}
free(p);
return 0;
}

2
src/udev/udev-watch.c
View file

@ -116,7 +116,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev)
unlink(filename);
r = symlink(udev_device_get_id_filename(dev), filename);
if (r < 0)
log_error("Failed to create symlink: %m");
log_error("Failed to create symlink %s: %m", filename);
udev_device_set_watch_handle(dev, wd);
}