diff --git a/xCAT-server/etc/init.d/xcatd.service b/xCAT-server/etc/init.d/xcatd.service index 6e368ef37b..4ae5e0f099 100644 --- a/xCAT-server/etc/init.d/xcatd.service +++ b/xCAT-server/etc/init.d/xcatd.service @@ -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 diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index b26692aec9..c4c5307bc6 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -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 <{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();