From e582521ec76ed7aba81fc593cef5503352478f2f Mon Sep 17 00:00:00 2001 From: Samveen Date: Sat, 13 Apr 2024 12:36:08 +0530 Subject: [PATCH 1/2] Fix #7434: add debian to check Signed-off-by: Samveen --- xCAT-server/lib/xcat/plugins/route.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/route.pm b/xCAT-server/lib/xcat/plugins/route.pm index cf5282505..6f09dda18 100644 --- a/xCAT-server/lib/xcat/plugins/route.pm +++ b/xCAT-server/lib/xcat/plugins/route.pm @@ -753,7 +753,7 @@ sub delete_route { my $os = xCAT::Utils->osver(); if ($os =~ /sles/) { #sles deletePersistentRoute_Sles($callback, $net, $mask, $gw_ip, $gw, $ifname); - } elsif ($os =~ /ubuntu/) { #ubuntu or Debian? + } elsif ($os =~ /ubuntu|debian/) { #ubuntu or Debian? deletePersistentRoute_Debian($callback, $net, $mask, $gw_ip, $gw, $ifname); } elsif ($os =~ /rh|fedora|centos|alma|rocky/) { #RH, Ferdora From e54aabef0e62245da5bddd6b1ce72baa3cd0906d Mon Sep 17 00:00:00 2001 From: Samveen Date: Sat, 13 Apr 2024 12:37:01 +0530 Subject: [PATCH 2/2] Fix #7433: correct typo in variable name Signed-off-by: Samveen --- xCAT-server/lib/xcat/plugins/debian.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm index 80b307961..b44e5b4be 100644 --- a/xCAT-server/lib/xcat/plugins/debian.pm +++ b/xCAT-server/lib/xcat/plugins/debian.pm @@ -438,7 +438,7 @@ sub copycd } else { - my $osdistoname = $distname . "-" . $arch; + my $osdistroname = $distname . "-" . $arch; my $temppath = "$installroot/$distname/$arch"; my @ret = xCAT::SvrUtils->update_osdistro_table($distname, $arch, $temppath, $osdistroname); if ($ret[0] != 0) {