Skip to content

Commit

Permalink
Do not add resume= option
Browse files Browse the repository at this point in the history
We don't support hibernation and this option cause
systemd-hibernate-resume service to fail.
  • Loading branch information
marmarek committed Jun 12, 2019
1 parent 23cb89f commit 6efd4da
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
31 changes: 31 additions & 0 deletions 0044-Do-not-add-resume-kernel-option.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From ea91297b2a7599937ceeefeb21a3a185db9118f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 12 Jun 2019 04:46:18 +0200
Subject: [PATCH] Do not add resume= kernel option

Qubes don't support hibernation.
---
pyanaconda/bootloader.py | 6 ------
1 file changed, 6 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index f4deb8460..bcac17de1 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -816,12 +816,6 @@ class BootLoader(object):
swap_devices = storage.fsset.swap_devices
dracut_devices.extend(swap_devices)

- # Add resume= option to enable hibernation on x86.
- # Choose the largest swap device for that.
- if blivet.arch.is_x86() and swap_devices:
- resume_device = max(swap_devices, key=lambda x: x.size)
- self.boot_args.add("resume=%s" % resume_device.fstab_spec)
-
# Does /usr have its own device? If so, we need to tell dracut
usr_device = storage.mountpoints.get("/usr")
if usr_device:
--
2.20.1

1 change: 1 addition & 0 deletions anaconda.spec
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Patch39: 0040-fix-encryption-passphrase-check.patch
Patch40: 0041-disable-os-prober.patch
Patch41: 0042-add-option-to-lock-root-account.patch
Patch42: 0043-Don-t-acquire-the-imp-s-lock-1644936.patch
Patch43: 0044-Do-not-add-resume-kernel-option.patch

# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
Expand Down

0 comments on commit 6efd4da

Please sign in to comment.