22e9bed03a
- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly (bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in (forwarded request 149703 from fcrozat) OBS-URL: https://build.opensuse.org/request/show/149704 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=122
116 lines
5.0 KiB
Diff
116 lines
5.0 KiB
Diff
From 40b8acd039cf1ea00167017e63d9c0a773002f0e Mon Sep 17 00:00:00 2001
|
|
From: Michal Schmidt <mschmidt@redhat.com>
|
|
Date: Fri, 9 Nov 2012 12:00:46 +0100
|
|
Subject: [PATCH] fstab-generator: more specific error messages
|
|
|
|
---
|
|
src/fstab-generator/fstab-generator.c | 22 +++++++++++-----------
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
|
|
index 251a346..62053b7 100644
|
|
--- a/src/fstab-generator/fstab-generator.c
|
|
+++ b/src/fstab-generator/fstab-generator.c
|
|
@@ -111,7 +111,7 @@ static int add_swap(const char *what, struct mntent *me) {
|
|
f = fopen(unit, "wxe");
|
|
if (!f) {
|
|
r = -errno;
|
|
- log_error("Failed to create unit file: %m");
|
|
+ log_error("Failed to create unit file %s: %m", unit);
|
|
goto finish;
|
|
}
|
|
|
|
@@ -138,7 +138,7 @@ static int add_swap(const char *what, struct mntent *me) {
|
|
|
|
fflush(f);
|
|
if (ferror(f)) {
|
|
- log_error("Failed to write unit file: %m");
|
|
+ log_error("Failed to write unit file %s: %m", unit);
|
|
r = -errno;
|
|
goto finish;
|
|
}
|
|
@@ -152,7 +152,7 @@ static int add_swap(const char *what, struct mntent *me) {
|
|
|
|
mkdir_parents_label(lnk, 0755);
|
|
if (symlink(unit, lnk) < 0) {
|
|
- log_error("Failed to create symlink: %m");
|
|
+ log_error("Failed to create symlink %s: %m", lnk);
|
|
r = -errno;
|
|
goto finish;
|
|
}
|
|
@@ -171,7 +171,7 @@ static int add_swap(const char *what, struct mntent *me) {
|
|
|
|
mkdir_parents_label(lnk, 0755);
|
|
if (symlink(unit, lnk) < 0) {
|
|
- log_error("Failed to create symlink: %m");
|
|
+ log_error("Failed to create symlink %s: %m", lnk);
|
|
r = -errno;
|
|
goto finish;
|
|
}
|
|
@@ -262,7 +262,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
|
|
f = fopen(unit, "wxe");
|
|
if (!f) {
|
|
r = -errno;
|
|
- log_error("Failed to create unit file: %m");
|
|
+ log_error("Failed to create unit file %s: %m", unit);
|
|
goto finish;
|
|
}
|
|
|
|
@@ -306,7 +306,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
|
|
|
|
fflush(f);
|
|
if (ferror(f)) {
|
|
- log_error("Failed to write unit file: %m");
|
|
+ log_error("Failed to write unit file %s: %m", unit);
|
|
r = -errno;
|
|
goto finish;
|
|
}
|
|
@@ -320,7 +320,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
|
|
|
|
mkdir_parents_label(lnk, 0755);
|
|
if (symlink(unit, lnk) < 0) {
|
|
- log_error("Failed to create symlink: %m");
|
|
+ log_error("Failed to create symlink %s: %m", lnk);
|
|
r = -errno;
|
|
goto finish;
|
|
}
|
|
@@ -342,7 +342,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
|
|
|
|
mkdir_parents_label(lnk, 0755);
|
|
if (symlink(unit, lnk) < 0) {
|
|
- log_error("Failed to create symlink: %m");
|
|
+ log_error("Failed to create symlink %s: %m", lnk);
|
|
r = -errno;
|
|
goto finish;
|
|
}
|
|
@@ -367,7 +367,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
|
|
f = fopen(automount_unit, "wxe");
|
|
if (!f) {
|
|
r = -errno;
|
|
- log_error("Failed to create unit file: %m");
|
|
+ log_error("Failed to create unit file %s: %m", automount_unit);
|
|
goto finish;
|
|
}
|
|
|
|
@@ -386,7 +386,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
|
|
|
|
fflush(f);
|
|
if (ferror(f)) {
|
|
- log_error("Failed to write unit file: %m");
|
|
+ log_error("Failed to write unit file %s: %m", automount_unit);
|
|
r = -errno;
|
|
goto finish;
|
|
}
|
|
@@ -400,7 +400,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
|
|
|
|
mkdir_parents_label(lnk, 0755);
|
|
if (symlink(automount_unit, lnk) < 0) {
|
|
- log_error("Failed to create symlink: %m");
|
|
+ log_error("Failed to create symlink %s: %m", lnk);
|
|
r = -errno;
|
|
goto finish;
|
|
}
|
|
--
|
|
1.7.10.4
|
|
|