mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-22 10:22:18 +00:00
Merge pull request #7975 from VersatusHPC/fix/postscript-route-syslog
fix(postscripts): scope IPv6 gateways and create the syslog directory
This commit is contained in:
@@ -49,6 +49,7 @@ jobs:
|
||||
sudo cp -R xCAT-test xCAT-server perl-xCAT xCAT "$workdir/"
|
||||
status=0
|
||||
sudo sh -c 'cd "$1" && bats xCAT-test/native/getinstdisk_selection.bats' sh "$workdir" || status=1
|
||||
sudo sh -c 'cd "$1" && bats xCAT-test/native/syslog_log_directory.bats' sh "$workdir" || status=1
|
||||
sudo sh -c 'cd "$1" && prove -v xCAT-test/native/getinstdisk_installer.t xCAT-test/native/enablekdump_per_node.t xCAT-test/native/sudoer_password_source.t xCAT-test/native/remoteshell_credentials.t' sh "$workdir" || status=1
|
||||
exit "$status"
|
||||
- name: Prepare xCAT syslog directory
|
||||
|
||||
@@ -28,6 +28,11 @@ fixtures. They require Bubblewrap, Bash, GNU core utilities, grep, sed, and
|
||||
permission to create user namespaces. The CI workflow installs Bubblewrap and
|
||||
enables those namespaces.
|
||||
|
||||
`routeop_linklocal.bats` also needs iproute2 and kernel support for dummy
|
||||
network interfaces. It maps root and grants `CAP_NET_ADMIN` only inside a
|
||||
new user and network namespace. It runs as an ordinary user and changes
|
||||
real kernel routes only in that private network namespace.
|
||||
|
||||
Missing prerequisites fail these tests without stopping unrelated test files.
|
||||
Non-Linux hosts report a skip. Set `TMPDIR` to a writable, executable filesystem
|
||||
if the default temporary directory is mounted with `noexec`.
|
||||
|
||||
@@ -0,0 +1,179 @@
|
||||
#!/usr/bin/env bats
|
||||
|
||||
load 'helpers/script_sandbox'
|
||||
|
||||
setup()
|
||||
{
|
||||
setup_script_sandbox cat dirname grep sed tr uname logger awk cut head rm touch mkdir mv
|
||||
local ip_binary
|
||||
ip_binary=$(PATH=/usr/sbin:/sbin:/usr/bin:/bin type -P ip) || return 1
|
||||
cp -L "$ip_binary" "$fixture/bin/ip"
|
||||
mkdir -p "$fixture/etc/sysconfig/network"
|
||||
printf '%s\n' SLE VERSION=15 >"$fixture/etc/SUSE-brand"
|
||||
sandbox+=(--ro-bind "$(repo_path xCAT/postscripts)" /tmp/postscripts
|
||||
--setenv OSVER sles15 --uid 0 --gid 0 --cap-add CAP_NET_ADMIN)
|
||||
cat >"$fixture/bin/route-test" <<'SH'
|
||||
#!/bin/bash
|
||||
set -eu
|
||||
ip link set lo up
|
||||
for dev in test0 test1; do
|
||||
ip link add "$dev" type dummy
|
||||
ip link set "$dev" up
|
||||
ip -6 address add fe80::2/64 dev "$dev" nodad
|
||||
ip -6 address add 2001:db8:1::2/64 dev "$dev" nodad
|
||||
done
|
||||
exec /bin/bash -eu -c "$1"
|
||||
SH
|
||||
chmod +x "$fixture/bin/route-test"
|
||||
}
|
||||
|
||||
run_routes()
|
||||
{
|
||||
run "${sandbox[@]}" /bin/bash /bin/route-test "$1"
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
@test 'routeop installs and repeats a link-local gateway route on its device' {
|
||||
run_routes '
|
||||
for pass in 1 2; do
|
||||
/tmp/postscripts/routeop add 2001:db8:2:: 64 fe80::1 test0
|
||||
ip -6 route show 2001:db8:2::/64 |
|
||||
grep -q "2001:db8:2::/64 via fe80::1 dev test0"
|
||||
done
|
||||
test "$(grep -c "^2001:db8:2::/64 fe80::1 - test0$" /etc/sysconfig/network/routes)" = 1
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop does not confuse a link-local route on another device' {
|
||||
run_routes '
|
||||
ip -6 route add 2001:db8:2::/64 via fe80::1 dev test1 metric 2000
|
||||
/tmp/postscripts/routeop add 2001:db8:2:: 64 fe80::1 test0
|
||||
ip -6 route show 2001:db8:2::/64 | grep -q "2001:db8:2::/64 via fe80::1 dev test0"
|
||||
ip -6 route show 2001:db8:2::/64 | grep -q "2001:db8:2::/64 via fe80::1 dev test1"
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop replaces and deletes the scoped gateway without deleting a neighbor' {
|
||||
run_routes '
|
||||
/tmp/postscripts/routeop replace 2001:db8:2:: 64 fe80::1 test0
|
||||
ip -6 route show 2001:db8:2::/64 | grep -q "2001:db8:2::/64 via fe80::1 dev test0"
|
||||
/tmp/postscripts/routeop replace 2001:db8:2:: 64 fe80::3 test0
|
||||
ip -6 route show 2001:db8:2::/64 | grep -q "2001:db8:2::/64 via fe80::3 dev test0"
|
||||
grep -qx "2001:db8:2::/64 fe80::3 - test0" /etc/sysconfig/network/routes
|
||||
ip -6 route add 2001:db8:2::/64 via fe80::3 dev test1 metric 512
|
||||
/tmp/postscripts/routeop delete 2001:db8:2:: 64 fe80::3 test0
|
||||
test -z "$(ip -6 route show 2001:db8:2::/64 via fe80::3 dev test0)"
|
||||
ip -6 route show 2001:db8:2::/64 | grep -q "2001:db8:2::/64 via fe80::3 dev test1"
|
||||
test -z "$(sed "/^[[:space:]]*$/d" /etc/sysconfig/network/routes)"
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop scopes expanded and upper-case link-local gateways' {
|
||||
run_routes '
|
||||
/tmp/postscripts/routeop replace 2001:db8:2:: 64 FE80:0000:0000:0000:0000:0000:0000:0001 test0
|
||||
ip -6 route show 2001:db8:2::/64 | grep -q "2001:db8:2::/64 via fe80::1 dev test0"
|
||||
grep -qx "2001:db8:2::/64 FE80:0000:0000:0000:0000:0000:0000:0001 - test0" /etc/sysconfig/network/routes
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop leaves persistence unchanged when a scoped replacement fails' {
|
||||
run_routes '
|
||||
echo "2001:db8:2::/64 fe80::1 - test0" >/etc/sysconfig/network/routes
|
||||
if /tmp/postscripts/routeop replace 2001:db8:2:: 64 fe80::3 missing0; then exit 1; fi
|
||||
grep -qx "2001:db8:2::/64 fe80::1 - test0" /etc/sysconfig/network/routes
|
||||
test -z "$(ip -6 route show 2001:db8:2::/64)"
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop retains global-gateway and connected-route behavior' {
|
||||
run_routes '
|
||||
/tmp/postscripts/routeop replace 2001:db8:2:: 64 2001:db8:1::1 test0
|
||||
ip -6 route show 2001:db8:2::/64 | grep -q "via 2001:db8:1::1"
|
||||
grep -qx "2001:db8:2::/64 2001:db8:1::1 - -" /etc/sysconfig/network/routes
|
||||
/tmp/postscripts/routeop replace 2001:db8:3:: 64 :: test0
|
||||
ip -6 route show 2001:db8:3::/64 | grep -q "dev test0"
|
||||
grep -qx "2001:db8:3::/64 :: - test0" /etc/sysconfig/network/routes
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop deletes exact SLES records and older unscoped entries' {
|
||||
run_routes '
|
||||
printf "%s\n" "2001:db8:2::/64 fe80::1 - test0" \
|
||||
"2001:db8:2::/64 fe80::1 - test01" \
|
||||
"2001:db8:3::/64 fe80::1 - -" >/etc/sysconfig/network/routes
|
||||
/tmp/postscripts/routeop delete 2001:db8:2:: 64 fe80::1 test0
|
||||
/tmp/postscripts/routeop delete 2001:db8:3:: 64 fe80::1 test0
|
||||
test "$(cat /etc/sysconfig/network/routes)" = "2001:db8:2::/64 fe80::1 - test01"
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop replaces an unscoped SLES entry without matching another device' {
|
||||
run_routes '
|
||||
printf "%s\n" "2001:db8:2::/64 fe80::1 - -" \
|
||||
"2001:db8:2::/64 fe80::1 - test01" >/etc/sysconfig/network/routes
|
||||
/tmp/postscripts/routeop add 2001:db8:2:: 64 fe80::1 test0
|
||||
test "$(grep -c "^2001:db8:2::/64 fe80::1 - test0$" /etc/sysconfig/network/routes)" = 1
|
||||
grep -qx "2001:db8:2::/64 fe80::1 - test01" /etc/sysconfig/network/routes
|
||||
test "$(grep -c " - -$" /etc/sysconfig/network/routes)" = 0
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop treats dotted interface names literally in saved routes' {
|
||||
run_routes '
|
||||
ip link add test0.1 type dummy
|
||||
ip link set test0.1 up
|
||||
printf "%s\n" "2001:db8:2::/64 fe80::1 - test0x1" >/etc/sysconfig/network/routes
|
||||
/tmp/postscripts/routeop add 2001:db8:2:: 64 fe80::1 test0.1
|
||||
grep -Fqx "2001:db8:2::/64 fe80::1 - test0.1" /etc/sysconfig/network/routes
|
||||
/tmp/postscripts/routeop delete 2001:db8:2:: 64 fe80::1 test0.1
|
||||
test "$(sed "/^#/d;/^$/d" /etc/sysconfig/network/routes)" = "2001:db8:2::/64 fe80::1 - test0x1"
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop retains the device in legacy Red Hat route6 files' {
|
||||
run_routes '
|
||||
rm /etc/SUSE-brand
|
||||
touch /etc/redhat-release
|
||||
mkdir -p /etc/sysconfig/network-scripts
|
||||
export OSVER=rhels8
|
||||
/tmp/postscripts/routeop replace 2001:db8:2:: 64 fe80::1 test0
|
||||
test "$(cat /etc/sysconfig/network-scripts/route6-test0)" = "2001:db8:2::/64 via fe80::1 dev test0"
|
||||
ip -6 route show 2001:db8:2::/64 | grep -q "via fe80::1 dev test0"
|
||||
printf "%s\n" "test0 2001:db8:2::/64 fe80::1" "test01 2001:db8:2::/64 fe80::1" >/etc/sysconfig/static-routes-ipv6
|
||||
/tmp/postscripts/routeop delete 2001:db8:2:: 64 fe80::1 test0
|
||||
test ! -s /etc/sysconfig/network-scripts/route6-test0
|
||||
test "$(cat /etc/sysconfig/static-routes-ipv6)" = "test01 2001:db8:2::/64 fe80::1"
|
||||
test -z "$(ip -6 route show 2001:db8:2::/64)"
|
||||
echo "2001:db8:2::/64 via fe80::1" >/etc/sysconfig/network-scripts/route6-test0
|
||||
/tmp/postscripts/routeop delete 2001:db8:2:: 64 fe80::1 test0
|
||||
test ! -s /etc/sysconfig/network-scripts/route6-test0
|
||||
'
|
||||
}
|
||||
|
||||
@test 'routeop scopes Debian interface up and down gateway commands' {
|
||||
run_routes '
|
||||
rm /etc/SUSE-brand
|
||||
touch /etc/debian_version
|
||||
mkdir -p /etc/network/interfaces.d
|
||||
printf "%s\n" "#XCAT_CONFIG" "source /etc/network/interfaces.d/*" >/etc/network/interfaces
|
||||
export OSVER=ubuntu24.04
|
||||
for layout in last middle; do
|
||||
printf "%s\n" "auto test0" "iface test0 inet manual" >/etc/network/interfaces.d/test0
|
||||
printf "%s\n" " up route -A inet6 add 2001:db8:2::/64 gw fe80::1" \
|
||||
" down route -A inet6 del 2001:db8:2::/64 gw fe80::1" \
|
||||
"post-up ip -6 route replace 2001:db8:2::/64 via fe80::1" >>/etc/network/interfaces.d/test0
|
||||
if [ "$layout" = middle ]; then echo "iface test1 inet manual" >>/etc/network/interfaces.d/test0; fi
|
||||
/tmp/postscripts/routeop add 2001:db8:2:: 64 fe80::1 test0
|
||||
grep -Fxq " up route -A inet6 add 2001:db8:2::/64 gw fe80::1 dev test0" /etc/network/interfaces.d/test0
|
||||
grep -Fxq " down route -A inet6 del 2001:db8:2::/64 gw fe80::1 dev test0" /etc/network/interfaces.d/test0
|
||||
if grep -Fxq "post-up ip -6 route replace 2001:db8:2::/64 via fe80::1" /etc/network/interfaces.d/test0; then exit 1; fi
|
||||
/tmp/postscripts/routeop delete 2001:db8:2:: 64 fe80::1 test0
|
||||
test "$(grep -c "2001:db8:2::" /etc/network/interfaces.d/test0)" = 0
|
||||
/tmp/postscripts/routeop replace 2001:db8:2:: 64 fe80::1 test0
|
||||
grep -Fxq "post-up ip -6 route replace 2001:db8:2::/64 via fe80::1 dev test0" /etc/network/interfaces.d/test0
|
||||
ip -6 route show 2001:db8:2::/64 | grep -q "via fe80::1 dev test0"
|
||||
/tmp/postscripts/routeop delete 2001:db8:2:: 64 fe80::1 test0
|
||||
test "$(grep -c "2001:db8:2::" /etc/network/interfaces.d/test0)" = 0
|
||||
done
|
||||
'
|
||||
}
|
||||
@@ -0,0 +1,197 @@
|
||||
#!/usr/bin/env bats
|
||||
|
||||
load '../bats/helpers/script_sandbox'
|
||||
|
||||
setup()
|
||||
{
|
||||
[ "$(id -u)" -eq 0 ] || skip 'native syslog ownership checks require root'
|
||||
setup_script_sandbox cat cp dirname grep egrep sed tr uname awk cut head touch mkdir \
|
||||
chown chmod stat id sleep logger rm date mktemp
|
||||
local index daemon
|
||||
# Keep real account IDs so rsyslog can drop its privileges.
|
||||
for index in "${!sandbox[@]}"; do
|
||||
if [ "${sandbox[$index]}" = --unshare-all ]; then
|
||||
sandbox[$index]=--unshare-pid
|
||||
fi
|
||||
done
|
||||
sandbox+=(--unshare-net --unshare-ipc --unshare-uts
|
||||
--ro-bind "$(repo_path xCAT/postscripts)" /tmp/postscripts
|
||||
--ro-bind "$(repo_path xCAT/xcat-upgrade-functions.sh)" /tmp/upgrade.sh)
|
||||
daemon=$(PATH=/usr/sbin:/sbin:/usr/bin:/bin type -P rsyslogd) || return 1
|
||||
cp -L "$daemon" "$fixture/bin/rsyslogd-real"
|
||||
daemon=$(PATH=/usr/sbin:/sbin:/usr/bin:/bin type -P ip) || return 1
|
||||
cp -L "$daemon" "$fixture/bin/ip"
|
||||
cp /etc/passwd /etc/group /etc/nsswitch.conf "$fixture/etc/"
|
||||
id syslog >/dev/null || return 1
|
||||
mkdir -p "$fixture/etc/rsyslog.d" "$fixture/etc/default" \
|
||||
"$fixture/etc/systemd/system" "$fixture/var/log" "$fixture/var/lib/rsyslog"
|
||||
touch "$fixture/etc/systemd/system/rsyslog.service"
|
||||
cat >"$fixture/etc/rsyslog.conf" <<'CONF'
|
||||
$PrivDropToUser syslog
|
||||
$PrivDropToGroup syslog
|
||||
module(load="imudp")
|
||||
input(type="imudp" address="127.0.0.1" port="1514")
|
||||
local4.* /var/log/xcat/cluster.log
|
||||
$IncludeConfig /etc/rsyslog.d/*.conf
|
||||
CONF
|
||||
cat >"$fixture/bin/rsyslogd" <<'SH'
|
||||
#!/bin/sh
|
||||
if [ "$1" = -v ] && [ "$SYSLOG_TEST_VERSION" != 8 ]; then
|
||||
echo "rsyslogd $SYSLOG_TEST_VERSION.0"
|
||||
else
|
||||
exec /bin/rsyslogd-real "$@"
|
||||
fi
|
||||
SH
|
||||
cat >"$fixture/bin/systemctl" <<'SH'
|
||||
#!/bin/bash
|
||||
set -eu
|
||||
[ "$*" = 'restart rsyslog' ]
|
||||
if [ -s /run/rsyslog.pid ]; then
|
||||
previous=$(cat /run/rsyslog.pid)
|
||||
kill "$previous"
|
||||
for ((i=0; i<100; i++)); do
|
||||
[ -d "/proc/$previous" ] || break
|
||||
sleep .02
|
||||
done
|
||||
[ ! -d "/proc/$previous" ]
|
||||
rm -f /run/rsyslog.pid
|
||||
fi
|
||||
/bin/rsyslogd-real -n -i /run/rsyslog.pid -f /etc/rsyslog.conf >>/run/daemon.log 2>&1 </dev/null &
|
||||
for ((i=0; i<100; i++)); do
|
||||
[ ! -s /run/rsyslog.pid ] || exit 0
|
||||
sleep .02
|
||||
done
|
||||
exit 1
|
||||
SH
|
||||
cat >"$fixture/bin/check-delivery" <<'SH'
|
||||
#!/bin/bash
|
||||
set -eu
|
||||
uid=$(id -u syslog)
|
||||
expected="^Uid:[[:space:]]+$uid[[:space:]]+$uid[[:space:]]+$uid[[:space:]]+$uid$"
|
||||
for ((i=0; i<100; i++)); do
|
||||
if grep -Eq "$expected" /proc/$(cat /run/rsyslog.pid)/status; then break; fi
|
||||
sleep .02
|
||||
done
|
||||
grep -Eq "$expected" /proc/$(cat /run/rsyslog.pid)/status
|
||||
logger -n 127.0.0.1 -P 1514 -d -p local4.info "$1"
|
||||
for ((i=0; i<100; i++)); do
|
||||
if grep -q "$1" /var/log/xcat/cluster.log; then break; fi
|
||||
sleep .02
|
||||
done
|
||||
grep -q "$1" /var/log/xcat/cluster.log
|
||||
SH
|
||||
cat >"$fixture/bin/log-test" <<'SH'
|
||||
#!/bin/bash
|
||||
set -eu
|
||||
ip link set lo up
|
||||
rm -f /run/rsyslog.pid
|
||||
if [ "$SYSLOG_TEST_ROLE" = mn ]; then touch /etc/xCATMN; fi
|
||||
if [ "$SYSLOG_TEST_VERSION" = 3 ]; then
|
||||
echo 'SYSLOGD_OPTIONS="-c 3"' >/etc/default/rsyslog
|
||||
fi
|
||||
case "$SYSLOG_TEST_DIRECTORY" in
|
||||
absent) ;;
|
||||
blocked) touch /var/log/xcat ;;
|
||||
*)
|
||||
mkdir -m "$SYSLOG_TEST_DIRECTORY" /var/log/xcat
|
||||
echo preserved >/var/log/xcat/old.log
|
||||
chmod 0600 /var/log/xcat/old.log
|
||||
;;
|
||||
esac
|
||||
exec /bin/bash -eu -c "$1"
|
||||
SH
|
||||
chmod +x "$fixture/bin/rsyslogd" "$fixture/bin/systemctl" \
|
||||
"$fixture/bin/log-test" "$fixture/bin/check-delivery"
|
||||
}
|
||||
|
||||
run_syslog()
|
||||
{
|
||||
local role=$1 directory=$2 version=$3 osver=$4 code=$5
|
||||
run "${sandbox[@]}" --setenv OSVER "$osver" --setenv SYSLOG '' \
|
||||
--setenv NTYPE service --setenv SVLOGLOCAL "$([ "$role" = forward ] && echo 0 || echo 1)" \
|
||||
--setenv MASTER 127.0.0.1:1515 --setenv SYSLOG_TEST_ROLE "$role" \
|
||||
--setenv SYSLOG_TEST_DIRECTORY "$directory" --setenv SYSLOG_TEST_VERSION "$version" \
|
||||
/bin/bash /bin/log-test "$code"
|
||||
if [ "$status" -ne 0 ]; then
|
||||
cat "$fixture/run/daemon.log" >&2
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
@test 'syslog creates a local log directory and delivers as syslog on MN and SN' {
|
||||
local role osver
|
||||
for role in mn sn; do
|
||||
for osver in ubuntu24.04 debian12; do
|
||||
run_syslog "$role" absent 8 "$osver" '
|
||||
for pass in 1 2; do
|
||||
/tmp/postscripts/syslog
|
||||
test "$(stat -c %U:%G:%a /var/log/xcat)" = syslog:adm:750
|
||||
check-delivery "directory-test-$pass"
|
||||
done
|
||||
'
|
||||
rm -rf "$fixture/var/log/xcat"
|
||||
rm -f "$fixture/etc/xCATMN"
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
@test 'syslog preserves existing directory modes and log file ownership' {
|
||||
local mode
|
||||
for mode in 0700 0750; do
|
||||
run_syslog mn "$mode" 8 ubuntu24.04 '
|
||||
before=$(stat -c %u:%g:%a /var/log/xcat/old.log)
|
||||
/tmp/postscripts/syslog
|
||||
test "$(stat -c %a /var/log/xcat)" = "${SYSLOG_TEST_DIRECTORY#0}"
|
||||
test "$(stat -c %U:%G /var/log/xcat)" = syslog:adm
|
||||
test "$(stat -c %u:%g:%a /var/log/xcat/old.log)" = "$before"
|
||||
test "$(cat /var/log/xcat/old.log)" = preserved
|
||||
check-delivery restricted-directory-test
|
||||
'
|
||||
rm -rf "$fixture/var/log/xcat"
|
||||
done
|
||||
}
|
||||
|
||||
@test 'syslog prepares the log directory after the real upgrade wrapper' {
|
||||
run_syslog mn absent 8 ubuntu24.04 '
|
||||
. /tmp/upgrade.sh
|
||||
xcat_run_upgrade /tmp/postscripts/syslog
|
||||
test "$(stat -c %U:%G /var/log/xcat)" = syslog:adm
|
||||
test -s /var/log/xcat/upgrade.log
|
||||
check-delivery upgrade-directory-test
|
||||
'
|
||||
}
|
||||
|
||||
@test 'syslog retains rsyslog compatibility-mode directory ownership' {
|
||||
run_syslog mn absent 3 ubuntu24.04 '
|
||||
/tmp/postscripts/syslog
|
||||
test "$(stat -c %U:%G:%a /var/log/xcat)" = syslog:adm:750
|
||||
check-delivery compatibility-directory-test
|
||||
'
|
||||
}
|
||||
|
||||
@test 'syslog retains the legacy reference-directory ownership' {
|
||||
run_syslog mn absent 5 ubuntu24.04 '
|
||||
chown root:syslog /var/log
|
||||
chmod 0775 /var/log
|
||||
/tmp/postscripts/syslog
|
||||
test "$(stat -c %u:%g /var/log/xcat)" = "$(stat -c %u:%g /var/log)"
|
||||
test "$(stat -c %a /var/log/xcat)" = 775
|
||||
check-delivery legacy-directory-test
|
||||
'
|
||||
}
|
||||
|
||||
@test 'syslog does not create a local directory on forwarding nodes' {
|
||||
run_syslog forward absent 8 ubuntu24.04 '
|
||||
/tmp/postscripts/syslog
|
||||
test ! -e /var/log/xcat
|
||||
grep -qx "\*\.\* @127.0.0.1:1515" /etc/rsyslog.d/remote.conf
|
||||
'
|
||||
}
|
||||
|
||||
@test 'syslog reports failure when the directory path is a file' {
|
||||
run_syslog mn blocked 8 ubuntu24.04 '
|
||||
if /tmp/postscripts/syslog; then exit 1; fi
|
||||
test -f /var/log/xcat
|
||||
test ! -e /run/rsyslog.pid
|
||||
'
|
||||
}
|
||||
+62
-15
@@ -143,7 +143,7 @@ route_exists()
|
||||
# ipv6
|
||||
if is_ipv6_route "$route_net"
|
||||
then
|
||||
result=`ip -6 route show $route_net/$route_mask`
|
||||
result=`ip -6 route show $route_net/$route_mask ${gateway_device:+via $route_gw dev $gateway_device}`
|
||||
if [ $? -ne 0 ] || [ -z "$result" ]
|
||||
then
|
||||
ret=0
|
||||
@@ -449,6 +449,15 @@ nmcli_persistent_route()
|
||||
fi
|
||||
}
|
||||
|
||||
remove_route_record()
|
||||
{
|
||||
local filename=$1
|
||||
local pattern
|
||||
[ -f "$filename" ] || return 0
|
||||
pattern=$(printf '%s\n' "$2" | sed 's/[][\\.^$*#]/\\&/g')
|
||||
sed -i "\#^[[:space:]]*${pattern}[[:space:]]*\$#d" "$filename"
|
||||
}
|
||||
|
||||
# handle the route replace operation that adding the setting to configuration file
|
||||
replace_persistent_route()
|
||||
{
|
||||
@@ -491,8 +500,8 @@ replace_persistent_route()
|
||||
route="$net/$mask :: - $ifname"
|
||||
route1="$net\/$mask :: - $ifname";
|
||||
else
|
||||
route="$net/$mask $gw - -"
|
||||
route1="$net\/$mask $gw - -";
|
||||
route="$net/$mask $gw - ${gateway_device:--}"
|
||||
route1="$net\/$mask $gw - ${gateway_device:--}";
|
||||
fi
|
||||
else
|
||||
# for ipv4
|
||||
@@ -549,8 +558,8 @@ replace_persistent_route()
|
||||
route="$net/$mask dev $ifname"
|
||||
route1="$net\/$mask dev $ifname"
|
||||
else
|
||||
route="$net/$mask via $gw"
|
||||
route1="$net\/$mask via $gw"
|
||||
route="$net/$mask via $gw${gateway_device:+ dev $gateway_device}"
|
||||
route1="$net\/$mask via $gw${gateway_device:+ dev $gateway_device}"
|
||||
fi
|
||||
else
|
||||
# ipv4
|
||||
@@ -696,8 +705,8 @@ add_persistent_route()
|
||||
route="$net/$mask :: - $ifname"
|
||||
route1="$net\/$mask :: - $ifname";
|
||||
else
|
||||
route="$net/$mask $gw - -"
|
||||
route1="$net\/$mask $gw - -";
|
||||
route="$net/$mask $gw - ${gateway_device:--}"
|
||||
route1="$net\/$mask $gw - ${gateway_device:--}";
|
||||
fi
|
||||
else
|
||||
if [ "$gw" = "" -o "$gw" = "0.0.0.0" ] ; then
|
||||
@@ -728,8 +737,13 @@ add_persistent_route()
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
local match_flags=
|
||||
if is_ipv6_route "$net" && [ -n "$gateway_device" ]; then
|
||||
remove_route_record "$filename" "$net/$mask $gw - -" || return $?
|
||||
match_flags=-Fx
|
||||
fi
|
||||
if [ -f $filename ]; then
|
||||
grep "$route" $filename 2>&1 1>/dev/null
|
||||
grep $match_flags "$route" $filename 2>&1 1>/dev/null
|
||||
if [ $? -ne 0 ]; then #route does not exist
|
||||
grep "$xcat_config_start" $filename 2>&1 1>/dev/null
|
||||
if [ $? -ne 0 ]; then #no xCAT section
|
||||
@@ -782,6 +796,11 @@ add_persistent_route()
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "$gateway_device" ] && [ "$v6flag" -eq 1 ]; then
|
||||
remove_route_record "$filename" "up route -A inet6 add $net/$mask gw $gw" || return $?
|
||||
remove_route_record "$filename" "down route -A inet6 del $net/$mask gw $gw" || return $?
|
||||
remove_route_record "$filename" "post-up ip -6 route replace $net/$mask via $gw" || return $?
|
||||
fi
|
||||
grep "$matchstr" $filename 2>&1 1>/dev/null
|
||||
if [ $? -ne 0 ];then
|
||||
foundflag=0
|
||||
@@ -796,8 +815,8 @@ add_persistent_route()
|
||||
echo " up route -A inet6 add $net/$mask dev $ifname" >> $tempfile
|
||||
echo " down route -A inet6 del $net/$mask dev $ifname" >> $tempfile
|
||||
else
|
||||
echo " up route -A inet6 add $net/$mask gw $gw" >> $tempfile
|
||||
echo " down route -A inet6 del $net/$mask gw $gw" >> $tempfile
|
||||
echo " up route -A inet6 add $net/$mask gw $gw${gateway_device:+ dev $gateway_device}" >> $tempfile
|
||||
echo " down route -A inet6 del $net/$mask gw $gw${gateway_device:+ dev $gateway_device}" >> $tempfile
|
||||
fi
|
||||
else
|
||||
if [ "$gw" = "" -o "$gw" = "0.0.0.0" ] ; then
|
||||
@@ -824,8 +843,8 @@ add_persistent_route()
|
||||
echo " up route -A inet6 add $net/$mask dev $ifname" >> $tempfile
|
||||
echo " down route -A inet6 del $net/$mask dev $ifname" >> $tempfile
|
||||
else
|
||||
echo " up route -A inet6 add $net/$mask gw $gw" >> $tempfile
|
||||
echo " down route -A inet6 del $net/$mask gw $gw" >> $tempfile
|
||||
echo " up route -A inet6 add $net/$mask gw $gw${gateway_device:+ dev $gateway_device}" >> $tempfile
|
||||
echo " down route -A inet6 del $net/$mask gw $gw${gateway_device:+ dev $gateway_device}" >> $tempfile
|
||||
fi
|
||||
else
|
||||
if [ "$gw" = "" -o "$gw" = "0.0.0.0" ] ; then
|
||||
@@ -924,6 +943,11 @@ rm_persistent_route()
|
||||
sles)
|
||||
#echo "sles"
|
||||
filename="/etc/sysconfig/network/routes";
|
||||
if is_ipv6_route "$net" && [ -n "$gateway_device" ]; then
|
||||
remove_route_record "$filename" "$net/$mask $gw - $gateway_device" || return $?
|
||||
remove_route_record "$filename" "$net/$mask $gw - -"
|
||||
return $?
|
||||
fi
|
||||
# ipv6 net
|
||||
if is_ipv6_route "$net"
|
||||
then
|
||||
@@ -984,6 +1008,15 @@ rm_persistent_route()
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "$gateway_device" ] && [ "$v6flag" -eq 1 ]; then
|
||||
local device_suffix
|
||||
for device_suffix in " dev $gateway_device" ""; do
|
||||
remove_route_record "$filename" "up route -A inet6 add $net/$mask gw $gw$device_suffix" || return $?
|
||||
remove_route_record "$filename" "down route -A inet6 del $net/$mask gw $gw$device_suffix" || return $?
|
||||
remove_route_record "$filename" "post-up ip -6 route replace $net/$mask via $gw$device_suffix" || return $?
|
||||
done
|
||||
return 0
|
||||
fi
|
||||
grep "$matchstr" $filename
|
||||
if [ $? -eq 0 ];then
|
||||
sed -i -e "/$matchstr/d" $filename
|
||||
@@ -998,6 +1031,13 @@ rm_persistent_route()
|
||||
nmcli_persistent_route delete "$net" "$mask" "$gw" "$ifname"
|
||||
return $?
|
||||
fi
|
||||
if is_ipv6_route "$net" && [ -n "$gateway_device" ]; then
|
||||
filename="/etc/sysconfig/network-scripts/route6-$ifname"
|
||||
remove_route_record "$filename" "$net/$mask via $gw dev $gateway_device" || return $?
|
||||
remove_route_record "$filename" "$net/$mask via $gw" || return $?
|
||||
remove_route_record /etc/sysconfig/static-routes-ipv6 "$ifname $net/$mask $gw"
|
||||
return $?
|
||||
fi
|
||||
#ipv6
|
||||
if is_ipv6_route "$net"
|
||||
then
|
||||
@@ -1048,6 +1088,13 @@ rm_persistent_route()
|
||||
|
||||
|
||||
|
||||
gateway_device=
|
||||
if [ "$(uname -s)" = "Linux" ]; then
|
||||
case "$gw" in
|
||||
[fF][eE][89aAbB][[:xdigit:]]:*) gateway_device=$ifname ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if command -v xcat_is_openeuler >/dev/null 2>&1 && xcat_is_openeuler "$OSVER"; then
|
||||
case "$op" in
|
||||
add|delete|replace)
|
||||
@@ -1071,7 +1118,7 @@ if [ "$op" = "add" ]; then
|
||||
if [ "$gw" = "" -o "$gw" = "::" ] ; then
|
||||
cmd="ip -6 route add $net/$mask dev $ifname"
|
||||
else
|
||||
cmd="ip -6 route add $net/$mask via $gw"
|
||||
cmd="ip -6 route add $net/$mask via $gw${gateway_device:+ dev $gateway_device}"
|
||||
fi
|
||||
else
|
||||
# AIX TODO
|
||||
@@ -1127,7 +1174,7 @@ elif [ "$op" = "delete" ]; then
|
||||
if [ "$gw" = "" -o "$gw" = "::" ] ; then
|
||||
cmd="ip -6 route delete $net/$mask dev $ifname"
|
||||
else
|
||||
cmd="ip -6 route delete $net/$mask via $gw"
|
||||
cmd="ip -6 route delete $net/$mask via $gw${gateway_device:+ dev $gateway_device}"
|
||||
fi
|
||||
else
|
||||
# AIX TODO
|
||||
@@ -1183,7 +1230,7 @@ elif [ "$op" = "replace" ]; then
|
||||
if [ "$net" = "default" ]; then
|
||||
cmd="ip -6 route replace default via $gw"
|
||||
else
|
||||
cmd="ip -6 route replace $net/$mask via $gw"
|
||||
cmd="ip -6 route replace $net/$mask via $gw${gateway_device:+ dev $gateway_device}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
+11
-3
@@ -83,6 +83,14 @@ is_lsb_ubuntu ()
|
||||
# failure (not Ubuntu), which is the correct outcome.
|
||||
}
|
||||
|
||||
set_log_directory_owner()
|
||||
{
|
||||
local mode=$1
|
||||
shift
|
||||
mkdir -p -m "$mode" /var/log/xcat || exit $?
|
||||
chown "$@" /var/log/xcat
|
||||
}
|
||||
|
||||
config_Rsyslog_C3()
|
||||
{
|
||||
isReceiving=0
|
||||
@@ -127,7 +135,7 @@ config_Rsyslog_C3()
|
||||
touch /var/log/messages
|
||||
chown syslog:adm /var/log/messages
|
||||
sed -i 's/\$PrivDropToGroup syslog/\$PrivDropToGroup adm/' $2
|
||||
chown syslog:adm /var/log/xcat
|
||||
set_log_directory_owner 0750 syslog:adm
|
||||
fi
|
||||
else
|
||||
sed -i 's/^\(\*\..*\)/\#\1/;
|
||||
@@ -286,7 +294,7 @@ config_rsyslog_V8()
|
||||
if ( pmatch $OSVER "ubuntu*" ) || ( is_lsb_ubuntu ) || ( pmatch $OSVER "debian*" ); then
|
||||
chown syslog:adm /var/log/messages
|
||||
sed -i 's/\$PrivDropToGroup syslog/\$PrivDropToGroup adm/' $conf_file
|
||||
chown syslog:adm /var/log/xcat
|
||||
set_log_directory_owner 0750 syslog:adm
|
||||
fi
|
||||
|
||||
# Mark the start of xCAT section
|
||||
@@ -523,7 +531,7 @@ else
|
||||
touch /var/log/messages
|
||||
if ( pmatch $OSVER "ubuntu*" ) || ( is_lsb_ubuntu ) || ( pmatch $OSVER "debian*" ); then
|
||||
chown --reference=/var/log /var/log/messages
|
||||
chown --reference=/var/log /var/log/xcat
|
||||
set_log_directory_owner "$(stat -c %a /var/log)" --reference=/var/log
|
||||
fi
|
||||
if [ $ng -eq 0 ]; then
|
||||
if [ ! -f $conf_file.XCATORIG ]; then
|
||||
|
||||
Reference in New Issue
Block a user