github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-26 11:13:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4501 from fidencio/topic/stable-2.4-backport-chronyd-fix

Browse Source 
stable-2.4 | rootfs: Fix chronyd.service failing on boot
This commit is contained in:
GabyCT
2022-06-22 12:32:21 -05:00
committed by GitHub
parent 6d93875ead f32a146637
commit 5d50fc3908
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/snap-release.yaml vendored
View File

@@ -26,7 +26,7 @@ jobs:
# Check semantic versioning format (x.y.z) and if the current tag is the latest tag # Check semantic versioning format (x.y.z) and if the current tag is the latest tag
if echo "${current_version}" | grep -q "^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+$" && echo -e "$latest_version\n$current_version" | sort -C -V; then if echo "${current_version}" | grep -q "^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+$" && echo -e "$latest_version\n$current_version" | sort -C -V; then
# Current version is the latest version, build it # Current version is the latest version, build it
snapcraft -d snap --destructive-mode snapcraft snap --debug --destructive-mode
fi fi
- name: Upload snap - name: Upload snap

2
.github/workflows/snap.yaml vendored
View File

@@ -24,4 +24,4 @@ jobs:
- name: Build snap - name: Build snap
if: ${{ !contains(github.event.pull_request.labels.*.name, 'force-skip-ci') }} if: ${{ !contains(github.event.pull_request.labels.*.name, 'force-skip-ci') }}
run: | run: |
snapcraft -d snap --destructive-mode snapcraft snap --debug --destructive-mode

7
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@@ -532,8 +532,13 @@ EOT
if [ -f "$chrony_systemd_service" ]; then if [ -f "$chrony_systemd_service" ]; then
# Remove user option, user could not exist in the rootfs # Remove user option, user could not exist in the rootfs
# Set the /var/lib/chrony for ReadWritePaths to be ignored if
# its nonexistent, this broke the service on boot previously
# due to the directory not being present "(code=exited, status=226/NAMESPACE)"
sed -i -e 's/^\(ExecStart=.*\)-u [[:alnum:]]*/\1/g' \ sed -i -e 's/^\(ExecStart=.*\)-u [[:alnum:]]*/\1/g' \
-e '/^\[Unit\]/a ConditionPathExists=\/dev\/ptp0' ${chrony_systemd_service} -e '/^\[Unit\]/a ConditionPathExists=\/dev\/ptp0' \
-e 's/^ReadWritePaths=\(.\+\) \/var\/lib\/chrony \(.\+\)$/ReadWritePaths=\1 -\/var\/lib\/chrony \2/m' \
${chrony_systemd_service}
fi fi
AGENT_DIR="${ROOTFS_DIR}/usr/bin" AGENT_DIR="${ROOTFS_DIR}/usr/bin"