mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-21 01:42:15 +00:00
3d58aefcba
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>
32 lines
1.1 KiB
Desktop File
32 lines
1.1 KiB
Desktop File
[Unit]
|
|
Description=xCAT management service
|
|
After=network.target syslog.service
|
|
|
|
[Service]
|
|
# A shell in ExecStart runs in initrc_t. xcatd must start directly, so the
|
|
# 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
|
|
RuntimeDirectory=xcat
|
|
RuntimeDirectoryMode=0755
|
|
ExecStart=/usr/sbin/xcatd -p /run/xcatd.pid
|
|
ExecStop=/bin/sh -c 'if [ -s /run/xcatd.pid ]; then kill -TERM "$(cat /run/xcatd.pid)" 2>/dev/null || true; fi'
|
|
LimitNOFILE=16000
|
|
RemainAfterExit=no
|
|
Restart=on-failure
|
|
RestartSec=5s
|
|
TimeoutStartSec=600
|
|
TimeoutStopSec=30
|
|
KillMode=mixed
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|