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
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From bdffb521d01a2e2bc342154d74cb519755c52c25 Mon Sep 17 00:00:00 2001
|
|
From: Kay Sievers <kay@vrfy.org>
|
|
Date: Wed, 16 Jan 2013 04:35:54 +0100
|
|
Subject: [PATCH] shutdown: ignore loop devices without a backing file
|
|
|
|
---
|
|
src/core/umount.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/src/core/umount.c b/src/core/umount.c
|
|
index c7b6cee..f0f2711 100644
|
|
--- a/src/core/umount.c
|
|
+++ b/src/core/umount.c
|
|
@@ -233,6 +233,7 @@ static int loopback_list_get(MountPoint **head) {
|
|
udev_list_entry_foreach(item, first) {
|
|
MountPoint *lb;
|
|
struct udev_device *d;
|
|
+ const char *backing;
|
|
char *loop;
|
|
const char *dn;
|
|
|
|
@@ -241,6 +242,12 @@ static int loopback_list_get(MountPoint **head) {
|
|
goto finish;
|
|
}
|
|
|
|
+ backing = udev_device_get_sysattr_value(d, "loop/backing_file");
|
|
+ if (!backing) {
|
|
+ udev_device_unref(d);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
if (!(dn = udev_device_get_devnode(d))) {
|
|
udev_device_unref(d);
|
|
continue;
|
|
--
|
|
1.7.10.4
|
|
|