diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4957f65..ebc9360 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -27,16 +27,12 @@ jobs: targets: "${{ matrix.arch }}-unknown-linux-gnu,${{ matrix.arch }}-unknown-linux-musl" - run: ./hack/ci/install-linux-deps.sh - run: ./hack/dist/bundle.sh - env: - KRATA_KERNEL_BUILD_JOBS: "5" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: krata-bundle-systemd-${{ matrix.arch }} path: "target/dist/bundle-systemd-${{ matrix.arch }}.tgz" compression-level: 0 - run: ./hack/dist/deb.sh - env: - KRATA_KERNEL_BUILD_SKIP: "1" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: krata-debian-${{ matrix.arch }} @@ -51,8 +47,6 @@ jobs: path: "target/dist/*_${{ matrix.arch }}.apk" compression-level: 0 - run: ./hack/os/build.sh - env: - KRATA_KERNEL_BUILD_SKIP: "1" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: krata-os-${{ matrix.arch }} diff --git a/hack/dist/bundle.sh b/hack/dist/bundle.sh index b3838b4..4988919 100755 --- a/hack/dist/bundle.sh +++ b/hack/dist/bundle.sh @@ -4,11 +4,6 @@ set -e # shellcheck source-path=SCRIPTDIR source=common.sh . "$(dirname "${0}")/common.sh" -if [ -z "${KRATA_KERNEL_BUILD_JOBS}" ] -then - KRATA_KERNEL_BUILD_JOBS="2" -fi - TARGET_ARCH="$("${KRATA_DIR}/hack/build/arch.sh")" BUNDLE_TAR="${OUTPUT_DIR}/bundle-systemd-${TARGET_ARCH}.tgz" rm -f "${BUNDLE_TAR}" diff --git a/resources/bundle/install.sh b/resources/bundle/install.sh index 82ab839..32946a1 100755 --- a/resources/bundle/install.sh +++ b/resources/bundle/install.sh @@ -7,7 +7,7 @@ remove_service_if_exists() { UNIT_PATH="$(systemctl show -P FragmentPath "${1}")" if [ -f "${UNIT_PATH}" ] then - echo "[WARN] disabling removing systemd unit ${UNIT_PATH}" > /dev/stderr + echo "[WARN] disabling and removing systemd unit ${UNIT_PATH}" > /dev/stderr systemctl disable --now "${1}" || true rm "${UNIT_PATH}" fi diff --git a/resources/openrc/kratad b/resources/openrc/kratad index de3920a..4c480ee 100644 --- a/resources/openrc/kratad +++ b/resources/openrc/kratad @@ -1,5 +1,5 @@ #!/sbin/openrc-run -description="Krata Control Daemon" +description="Krata Isolation Engine" command="/usr/libexec/kratad" supervisor="supervise-daemon" output_log="/var/log/kratad.log" diff --git a/resources/systemd/kratad.service b/resources/systemd/kratad.service index 4ea46d6..e9e2b49 100644 --- a/resources/systemd/kratad.service +++ b/resources/systemd/kratad.service @@ -1,5 +1,5 @@ [Unit] -Description=Krata Control Daemon +Description=Krata Isolation Engine [Service] Restart=on-failure diff --git a/resources/systemd/kratanet.service b/resources/systemd/kratanet.service index a546158..54fd6f4 100644 --- a/resources/systemd/kratanet.service +++ b/resources/systemd/kratanet.service @@ -1,5 +1,5 @@ [Unit] -Description=Krata Networking Daemon +Description=Krata Networking Engine [Service] Wants=kratad.service