34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 316382fb90c7018b5309bacf66c5f18488c2a3c4 Mon Sep 17 00:00:00 2001
|
|
From: David Tardon <dtardon@redhat.com>
|
|
Date: Mon, 12 Dec 2022 16:21:30 +0100
|
|
Subject: [PATCH] swap: tell swapon to reinitialize swap if needed
|
|
|
|
If the page size of a swap space doesn't match the page size of the
|
|
currently running kernel, swapon will fail. Let's instruct it to
|
|
reinitialize the swap space instead.
|
|
|
|
(cherry picked from commit cc137d53e36da5e57b060be5e621864f572b2cac)
|
|
(cherry picked from commit a0ac79bce9255cf33b0f208b18d888f0f700133c)
|
|
(cherry picked from commit 8be5a12c7170ed7e7b4303c16573e463ef997e23)
|
|
(cherry picked from commit f8201271fdaef4e3a68efac8a21e9f195e4e4a6b)
|
|
---
|
|
src/core/swap.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/swap.c b/src/core/swap.c
|
|
index 3843b19500..83e77d24ae 100644
|
|
--- a/src/core/swap.c
|
|
+++ b/src/core/swap.c
|
|
@@ -836,7 +836,7 @@ static void swap_enter_activating(Swap *s) {
|
|
}
|
|
}
|
|
|
|
- r = exec_command_set(s->control_command, "/sbin/swapon", NULL);
|
|
+ r = exec_command_set(s->control_command, "/sbin/swapon", "--fixpgsz", NULL);
|
|
if (r < 0)
|
|
goto fail;
|
|
|
|
--
|
|
2.27.0
|
|
|