From def36c04448ce785ab321751ed5fa8a2aa78f7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?=
 <2031761+viniciusferrao@users.noreply.github.com>
Date: Tue, 18 Aug 2026 13:37:13 -0300
Subject: [PATCH] test(enablekdump): cover migration from the legacy shared
 root=

Start the RHEL 7 run from a sysconfig carrying the shared-root value the
previous script wrote, as on an already-deployed node, plus options from
the stock RHEL 7 file. Assert that exactly one root= remains, that it
points at the node subdirectory, that rd.neednet=1 and rootflags=nofail
survive, and that a second run leaves KDUMP_COMMANDLINE_APPEND
unchanged.

Against the previous prepend-only sed the count and idempotency
assertions fail: the legacy root= survives as the last token, which is
the one dracut honors.
---
 xCAT-test/unit/enablekdump_per_node.t | 32 +++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/xCAT-test/unit/enablekdump_per_node.t b/xCAT-test/unit/enablekdump_per_node.t
index e17730e28..54802817a 100644
--- a/xCAT-test/unit/enablekdump_per_node.t
+++ b/xCAT-test/unit/enablekdump_per_node.t
@@ -21,13 +21,14 @@ sub run_enablekdump {
     my (%opt) = @_;
     my $osver = $opt{osver};
     my $node  = $opt{node} || 'n01';
+    my $sysconfig = defined $opt{sysconfig} ? $opt{sysconfig}
+        : "KDUMP_COMMANDLINE=\"\"\nKDUMP_COMMANDLINE_APPEND=\"\"\n";
 
     my $root = tempdir(CLEANUP => 1);
     make_path("$root/etc/sysconfig", "$root/target", "$root/bin");
 
     # /etc/sysconfig/kdump must exist for the in-place seds to land.
-    write_file("$root/etc/sysconfig/kdump",
-        "KDUMP_COMMANDLINE=\"\"\nKDUMP_COMMANDLINE_APPEND=\"\"\n");
+    write_file("$root/etc/sysconfig/kdump", $sysconfig);
     # xcatlib.sh is sourced; only restartservice is needed and is a no-op here.
     write_file("$root/xcatlib.sh", "restartservice(){ :; }\n");
     write_file("$root/bin/logger", "#!/bin/sh\nexit 0\n");
@@ -102,4 +103,31 @@ sub write_file {
     ok(!-e "$r->{target}/proc", 'the RHEL 7 dummy proc is not written at the shared root');
 }
 
+# --- RHEL 7 migration: a legacy shared root= is replaced, not kept ----------
+# A node configured by the previous script carries root=nfs:<server>:<export>
+# in KDUMP_COMMANDLINE_APPEND. dracut takes the last root= on the command
+# line, so leaving the legacy value behind would defeat the migration.
+{
+    my $legacy = qq{KDUMP_COMMANDLINE=""\n}
+               . qq{KDUMP_COMMANDLINE_APPEND="root=nfs:10.0.0.1:/dumparea rd.neednet=1 rootflags=nofail"\n};
+    my $r = run_enablekdump(osver => 'rhels7.9', node => 'n07',
+        sysconfig => $legacy);
+
+    my ($append) = $r->{sysconfig} =~ m{^KDUMP_COMMANDLINE_APPEND="([^"]*)"}m;
+    my @roots = grep { /^root=/ } split ' ', defined $append ? $append : '';
+    is(scalar @roots, 1, 'exactly one root= remains after migrating a legacy config');
+    is($roots[0], 'root=nfs:10.0.0.1:/dumparea/n07',
+        'the remaining root= points at the node subdirectory');
+    like($append, qr{(?:^|\s)rd\.neednet=1(?:\s|$)},
+        'unrelated options on the legacy line are preserved');
+    like($append, qr{(?:^|\s)rootflags=nofail(?:\s|$)},
+        'rootflags= is not mistaken for a root= token');
+
+    # Re-running against its own output must not stack another root=.
+    my $r2 = run_enablekdump(osver => 'rhels7.9', node => 'n07',
+        sysconfig => $r->{sysconfig});
+    my ($append2) = $r2->{sysconfig} =~ m{^KDUMP_COMMANDLINE_APPEND="([^"]*)"}m;
+    is($append2, $append, 'a second run leaves KDUMP_COMMANDLINE_APPEND unchanged');
+}
+
 done_testing();