294700e6ce
add: 1026-re-add-persistent-net.patch - rebase all patches, ensure that they apply properly. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=357
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
From 67ab5f761f9b854d8ce85f9ee47b298e497f8bd9 Mon Sep 17 00:00:00 2001
|
|
From: Tom Gundersen <teg@jklm.no>
|
|
Date: Tue, 27 Nov 2012 01:09:28 +0100
|
|
Subject: [PATCH] fstab-generator: make error more helpful in case of
|
|
duplicates in fstab
|
|
|
|
Traditional sysvinit systems would not complain about duplicates in
|
|
fstab. Rather it (through monut -a) would mount one fs on top of another,
|
|
in effect the last entry taking precedent.
|
|
|
|
In systemd, the first entry takes precedent, all subsequent ones are
|
|
ignored and an error is printed.
|
|
|
|
The change of behavior and the source of this error message was causing
|
|
some confusion, so give a hint what migt be wrong.
|
|
---
|
|
src/fstab-generator/fstab-generator.c | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
Index: systemd-195/src/fstab-generator/fstab-generator.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/fstab-generator/fstab-generator.c
|
|
+++ systemd-195/src/fstab-generator/fstab-generator.c
|
|
@@ -111,7 +111,10 @@ static int add_swap(const char *what, st
|
|
f = fopen(unit, "wxe");
|
|
if (!f) {
|
|
r = -errno;
|
|
- log_error("Failed to create unit file %s: %m", unit);
|
|
+ if (errno == EEXIST)
|
|
+ log_error("Failed to create swap unit file %s, as it already exists. Duplicate entry in /etc/fstab?", unit);
|
|
+ else
|
|
+ log_error("Failed to create unit file %s: %m", unit);
|
|
goto finish;
|
|
}
|
|
|
|
@@ -262,7 +265,10 @@ static int add_mount(const char *what, c
|
|
f = fopen(unit, "wxe");
|
|
if (!f) {
|
|
r = -errno;
|
|
- log_error("Failed to create unit file %s: %m", unit);
|
|
+ if (errno == EEXIST)
|
|
+ log_error("Failed to create mount unit file %s, as it already exists. Duplicate entry in /etc/fstab?", unit);
|
|
+ else
|
|
+ log_error("Failed to create unit file %s: %m", unit);
|
|
goto finish;
|
|
}
|
|
|