fix(install): use /usr/sbin as install path and fix systemd dependency (#245)

This commit is contained in:
Alex Zenla
2024-07-11 23:49:02 -07:00
committed by GitHub
parent d1b2cb3683
commit 1126f1ffc9
6 changed files with 10 additions and 10 deletions

4
hack/dist/systar.sh vendored
View File

@ -22,9 +22,9 @@ tar xf "${OUTPUT_DIR}/bundle-systemd-${TARGET_ARCH}.tgz"
mkdir sys mkdir sys
cd sys cd sys
mkdir -p usr/bin usr/libexec mkdir -p usr/bin usr/sbin
mv ../krata/kratactl usr/bin mv ../krata/kratactl usr/bin
mv ../krata/kratanet ../krata/kratad usr/libexec/ mv ../krata/kratanet ../krata/kratad usr/sbin/
if [ "${SYSTAR_VARIANT}" = "openrc" ] if [ "${SYSTAR_VARIANT}" = "openrc" ]
then then

View File

@ -23,11 +23,11 @@ remove_service_if_exists kratanet.service
cp kratad.service /usr/lib/systemd/system/kratad.service cp kratad.service /usr/lib/systemd/system/kratad.service
cp kratanet.service /usr/lib/systemd/system/kratanet.service cp kratanet.service /usr/lib/systemd/system/kratanet.service
cp kratad kratanet /usr/libexec cp kratad kratanet /usr/sbin
cp kratactl /usr/bin cp kratactl /usr/bin
chmod +x /usr/libexec/kratad chmod +x /usr/sbin/kratad
chmod +x /usr/libexec/kratanet chmod +x /usr/sbin/kratanet
chmod +x /usr/bin/kratactl chmod +x /usr/bin/kratactl
mkdir -p /var/lib/krata /usr/share/krata/guest mkdir -p /var/lib/krata /usr/share/krata/guest

View File

@ -8,5 +8,5 @@ rm -f /usr/lib/systemd/system/kratad.service
rm -f /usr/lib/systemd/system/kratanet.service rm -f /usr/lib/systemd/system/kratanet.service
rm -f /usr/bin/kratactl rm -f /usr/bin/kratactl
rm -f /usr/libexec/kratad /usr/libexec/kratanet rm -f /usr/sbin/kratad /usr/sbin/kratanet
rm -rf /usr/share/krata rm -rf /usr/share/krata

View File

@ -1,6 +1,6 @@
#!/sbin/openrc-run #!/sbin/openrc-run
description="Krata Isolation Engine" description="Krata Isolation Engine"
command="/usr/libexec/kratad" command="/usr/sbin/kratad"
supervisor="supervise-daemon" supervisor="supervise-daemon"
output_log="/var/log/kratad.log" output_log="/var/log/kratad.log"
error_log="/var/log/kratad.err" error_log="/var/log/kratad.err"

View File

@ -1,6 +1,6 @@
#!/sbin/openrc-run #!/sbin/openrc-run
description="Krata Networking Daemon" description="Krata Networking Daemon"
command="/usr/libexec/kratanet" command="/usr/sbin/kratanet"
supervisor="supervise-daemon" supervisor="supervise-daemon"
output_log="/var/log/kratanet.log" output_log="/var/log/kratanet.log"
error_log="/var/log/kratanet.err" error_log="/var/log/kratanet.err"

View File

@ -1,9 +1,9 @@
[Unit] [Unit]
Description=Krata Networking Engine Description=Krata Networking Engine
[Service]
Wants=kratad.service Wants=kratad.service
After=kratad.service After=kratad.service
[Service]
Restart=on-failure Restart=on-failure
Type=simple Type=simple
ExecStart=/usr/sbin/kratanet ExecStart=/usr/sbin/kratanet