mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-15 21:38:10 +00:00
fix(xcat-core): a relocated xcatd loads the modules of another installation
xcatd.service sets XCATROOT and PATH to the literal /opt/xcat. The previous ExecStart sourced xcat.sh, which %post generates from RPM_INSTALL_PREFIX0, so a relocated package got its own prefix. With the package installed under /srv/xcat the daemon symlink reaches /srv/xcat/sbin/xcatd and the Perl search path still names /opt/xcat, so xcatd cannot load its own modules unless the administrator overrides the environment or a default installation is left behind. %post writes /etc/xcat/xcatroot.env with XCATROOT and PATH built from RPM_INSTALL_PREFIX0, and the unit reads it with EnvironmentFile. The order is the default in the unit, then that file, then /etc/sysconfig/xcat, so the recorded prefix replaces the default and the site file keeps the last word. ExecStart stays a direct call, so the kernel still enters xcat_t on the xcatd script. %preun removes the file on erase. The file is not in %files, so rpm --verify is unaffected. xcatd_relocated_startup.t fails 3 checks of its /srv/xcat subtest without this change. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
This commit is contained in:
@@ -7,6 +7,11 @@ After=network.target syslog.service
|
||||
# kernel enters xcat_t on the xcatd script.
|
||||
Environment=XCATROOT=/opt/xcat PERL_BADLANG=0
|
||||
Environment=PATH=/opt/xcat/bin:/opt/xcat/sbin:/opt/xcat/share/xcat/tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
# The two lines above hold the default prefix. %post writes xcatroot.env with
|
||||
# the prefix rpm relocated the package to, and a later setting replaces an
|
||||
# earlier one, so a relocated install reaches its own modules. The site file
|
||||
# comes last and keeps the last word.
|
||||
EnvironmentFile=-/etc/xcat/xcatroot.env
|
||||
EnvironmentFile=-/etc/sysconfig/xcat
|
||||
Type=forking
|
||||
PIDFile=/run/xcatd.pid
|
||||
|
||||
@@ -519,6 +519,15 @@ ln -sf $RPM_INSTALL_PREFIX0/share/xcat/netboot/centos $RPM_INSTALL_PREFIX0/share
|
||||
xcatd_init_compat=$RPM_INSTALL_PREFIX0/share/xcat/scripts/xcatd-init-compat
|
||||
export XCATROOT="$RPM_INSTALL_PREFIX0"
|
||||
|
||||
# xcatd.service carries the default prefix. Record the prefix of this install,
|
||||
# so a relocated package starts the daemon of its own tree.
|
||||
mkdir -p /etc/xcat
|
||||
cat > /etc/xcat/xcatroot.env <<EOF
|
||||
XCATROOT=$RPM_INSTALL_PREFIX0
|
||||
PATH=$RPM_INSTALL_PREFIX0/bin:$RPM_INSTALL_PREFIX0/sbin:$RPM_INSTALL_PREFIX0/share/xcat/tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
EOF
|
||||
chmod 644 /etc/xcat/xcatroot.env
|
||||
|
||||
if [ "$1" = "1" ]; then #Only if installing for the first time..
|
||||
if "$xcatd_init_compat" uses-systemd --explicit-target; then
|
||||
"$xcatd_init_compat" configure --explicit-target || exit 1
|
||||
@@ -646,6 +655,7 @@ if [ $1 == 0 ]; then #This means only on -e
|
||||
"$xcatd_init_compat" unregister-all || true
|
||||
"$xcatd_init_compat" remove-managed || true
|
||||
rm -f /usr/sbin/xcatd #remove the symbolic
|
||||
rm -f /etc/xcat/xcatroot.env #%post wrote it, so %preun takes it away
|
||||
|
||||
fi
|
||||
%endif
|
||||
|
||||
@@ -56,7 +56,11 @@ foreach my $dir (qw(/opt/xcat/bin /opt/xcat/sbin /opt/xcat/share/xcat/tools
|
||||
ok((grep { $_ eq $dir } @path), "the unit PATH has $dir");
|
||||
}
|
||||
|
||||
is_deeply($service->{EnvironmentFile}, ['-/etc/sysconfig/xcat'],
|
||||
'/etc/sysconfig/xcat can still override the environment');
|
||||
# A later setting replaces an earlier one, so the order decides who wins: the
|
||||
# prefix %post recorded beats the default in the unit, and the site file beats
|
||||
# both.
|
||||
is_deeply($service->{EnvironmentFile},
|
||||
[ '-/etc/xcat/xcatroot.env', '-/etc/sysconfig/xcat' ],
|
||||
'the install prefix is read before the site file, and both are optional');
|
||||
|
||||
done_testing();
|
||||
|
||||
Reference in New Issue
Block a user