forked from pool/systemd
70c63e98f9
- mark more subpackages as !bootstrap for systemd-mini usage. - spec : remove --with-firmware-path, firmware loader was removed in v217 - spec: remove --disable-multi-seat-x, gone.(fixed in xorg) - spec: Do not enable systemd-readahead-collect.service and systemd-readahead-replay.service as these do not exist anymore. - spec: drop timedate-add-support-for-openSUSE-version-of-etc-sysconfig.patch Yast was fixed to write all timezone changes exactly how timedated expects things to be done. - spec: remove handle-etc-HOSTNAME.patch, since late 2014 the netcfg package handles the migration from /etc/HOSTNAME to /etc/hostname and owns both files. -spec: remove boot.udev and systemd-journald.init as they currently serve no purpose. - suse-sysv-bootd-support.diff: Remove HAVE_SYSVINIT conditions, we are in sysvcompat-only codepath, also remove the code targetting other distributions, never compiled as the TARGET_$DISTRO macros are never defined. - systemd-powerd-initctl-support.patch guard with HAVE_SYSV_COMPAT - set-and-use-default-logconsole.patch: fix HAVE_SYSV_COMPAT guards - insserv-generator.patch: Only build when sysvcompat is enabled - vhangup-on-all-consoles.patch add a comment indicating this is a workaround for a kernel bug. - spec: Add option to allow disabling sysvinit compat at build time. - spec: Add option to enable resolved at build time. - spec: Remove all %ifs for !factory products, current systemd releases can neither be built nor installed in older products without upgrading several components of the base system. (removed: 1008-add-msft-compability-rules.patch was only for =< 13.1) - spec: remove all dummy "aliases" to /etc/init.d, that made sense only when those init scripts still existed. (dummy localfs.service source: gone) OBS-URL: https://build.opensuse.org/request/show/286653 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=215
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
---
|
|
src/fstab-generator/fstab-generator.c | 45 +++++++++++++++++++++++++++++++++-
|
|
1 file changed, 44 insertions(+), 1 deletion(-)
|
|
|
|
Index: systemd/src/fstab-generator/fstab-generator.c
|
|
===================================================================
|
|
--- systemd.orig/src/fstab-generator/fstab-generator.c
|
|
+++ systemd/src/fstab-generator/fstab-generator.c
|
|
@@ -48,6 +48,49 @@ static char *arg_usr_what = NULL;
|
|
static char *arg_usr_fstype = NULL;
|
|
static char *arg_usr_options = NULL;
|
|
|
|
+static int check_crypttab(const char *what) {
|
|
+ _cleanup_fclose_ FILE *f = NULL;
|
|
+ unsigned n = 0;
|
|
+
|
|
+ f = fopen("/etc/crypttab", "re");
|
|
+ if (!f) {
|
|
+ if (errno != ENOENT)
|
|
+ log_error("Failed to open /etc/crypttab: %m");
|
|
+
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+
|
|
+ for (;;) {
|
|
+ char line[LINE_MAX], *l;
|
|
+ _cleanup_free_ char *name = NULL, *device = NULL, *password = NULL, *options = NULL;
|
|
+ int k;
|
|
+
|
|
+ if (!fgets(line, sizeof(line), f))
|
|
+ break;
|
|
+
|
|
+ n++;
|
|
+
|
|
+ l = strstrip(line);
|
|
+ if (*l == '#' || *l == 0)
|
|
+ continue;
|
|
+
|
|
+ k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options);
|
|
+ if (k < 2 || k > 4) {
|
|
+ log_error("Failed to parse /etc/crypttab:%u, ignoring.", n);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (strcmp((what + 12), name) == 0) {
|
|
+ if (options && strstr(options, "noauto"))
|
|
+ return 0;
|
|
+
|
|
+ return 1;
|
|
+ }
|
|
+ }
|
|
+ return 1;
|
|
+}
|
|
+
|
|
static int add_swap(
|
|
const char *what,
|
|
struct mntent *me,
|
|
@@ -118,7 +161,7 @@ static int add_swap(
|
|
if (r < 0)
|
|
return r;
|
|
|
|
- if (!noauto) {
|
|
+ if (!noauto && check_crypttab(what) != 0) {
|
|
lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET,
|
|
nofail ? ".wants/" : ".requires/", name, NULL);
|
|
if (!lnk)
|