|
 |
6edea0 |
From f47136bada397328d0a6f36a81138699c793fe92 Mon Sep 17 00:00:00 2001
|
|
|
6edea0 |
From: Kairui Song <kasong@redhat.com>
|
|
|
6edea0 |
Date: Wed, 27 May 2020 21:59:55 +0800
|
|
|
6edea0 |
Subject: [PATCH] Remove cleanup_trace_mem calls
|
|
|
6edea0 |
|
|
|
6edea0 |
In commit 49c4172 all shell based memory tracing functions are removed,
|
|
|
6edea0 |
there are some left over. Remove them as well.
|
|
|
6edea0 |
|
|
|
6edea0 |
Signed-off-by: Kairui Song <kasong@redhat.com>
|
|
|
6edea0 |
(cherry picked from commit 2a611328652388b809a379403ceec126cb55819f)
|
|
|
6edea0 |
|
|
|
6edea0 |
Resolves: #1829528
|
|
|
6edea0 |
---
|
|
|
6edea0 |
modules.d/98dracut-systemd/dracut-pre-pivot.sh | 1 -
|
|
|
6edea0 |
modules.d/99base/init.sh | 1 -
|
|
|
6edea0 |
2 files changed, 2 deletions(-)
|
|
|
6edea0 |
|
|
|
6edea0 |
diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.sh b/modules.d/98dracut-systemd/dracut-pre-pivot.sh
|
|
|
6edea0 |
index 96e6f8ca..cc70e3c3 100755
|
|
|
6edea0 |
--- a/modules.d/98dracut-systemd/dracut-pre-pivot.sh
|
|
|
6edea0 |
+++ b/modules.d/98dracut-systemd/dracut-pre-pivot.sh
|
|
|
6edea0 |
@@ -14,7 +14,6 @@ make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab'
|
|
|
6edea0 |
getarg 'rd.break=pre-pivot' 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break pre-pivot"
|
|
|
6edea0 |
source_hook pre-pivot
|
|
|
6edea0 |
|
|
|
6edea0 |
-cleanup_trace_mem
|
|
|
6edea0 |
# pre pivot cleanup scripts are sourced just before we switch over to the new root.
|
|
|
6edea0 |
getarg 'rd.break=cleanup' 'rdbreak=cleanup' && emergency_shell -n cleanup "Break cleanup"
|
|
|
6edea0 |
source_hook cleanup
|
|
|
6edea0 |
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
|
|
|
6edea0 |
index 2c0ccd66..a5633936 100755
|
|
|
6edea0 |
--- a/modules.d/99base/init.sh
|
|
|
6edea0 |
+++ b/modules.d/99base/init.sh
|
|
|
6edea0 |
@@ -271,7 +271,6 @@ getarg 'rd.break=pre-pivot' -d 'rdbreak=pre-pivot' && emergency_shell -n pre-piv
|
|
|
6edea0 |
source_hook pre-pivot
|
|
|
6edea0 |
|
|
|
6edea0 |
make_trace_mem "hook cleanup" '1:shortmem' '2+:mem' '3+:slab'
|
|
|
6edea0 |
-cleanup_trace_mem
|
|
|
6edea0 |
# pre pivot cleanup scripts are sourced just before we switch over to the new root.
|
|
|
6edea0 |
getarg 'rd.break=cleanup' -d 'rdbreak=cleanup' && emergency_shell -n cleanup "Break cleanup"
|
|
|
6edea0 |
source_hook cleanup
|
|
|
6edea0 |
|