github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-18 17:33:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4987 from ryansavino/initrd-fixes-for-ubuntu-systemd

Browse Source 
Initrd fixes for ubuntu systemd
This commit is contained in:
Fabiano Fidêncio 2022-08-30 09:16:43 +02:00 committed by GitHub
commit 1b92a946d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,6 +520,11 @@ EOF
chrony_conf_file="${ROOTFS_DIR}/etc/chrony/chrony.conf" chrony_conf_file="${ROOTFS_DIR}/etc/chrony/chrony.conf"
chrony_systemd_service="${ROOTFS_DIR}/lib/systemd/system/chrony.service" chrony_systemd_service="${ROOTFS_DIR}/lib/systemd/system/chrony.service"
;; ;;
"ubuntu")
# Fix for #4932 - Boot hang at: "A start job is running for /dev/ttyS0"
mkdir -p "${ROOTFS_DIR}/etc/systemd/system/getty.target.wants"
ln -sf "/lib/systemd/system/getty@.service" "${ROOTFS_DIR}/etc/systemd/system/getty.target.wants/getty@ttyS0.service"
;;
*) *)
chrony_conf_file="${ROOTFS_DIR}/etc/chrony.conf" chrony_conf_file="${ROOTFS_DIR}/etc/chrony.conf"
chrony_systemd_service="${ROOTFS_DIR}/usr/lib/systemd/system/chronyd.service" chrony_systemd_service="${ROOTFS_DIR}/usr/lib/systemd/system/chronyd.service"
@ -599,7 +604,13 @@ EOF
[ -x "${AGENT_DEST}" ] || die "${AGENT_DEST} is not installed in ${ROOTFS_DIR}" [ -x "${AGENT_DEST}" ] || die "${AGENT_DEST} is not installed in ${ROOTFS_DIR}"
OK "Agent installed" OK "Agent installed"
[ "${AGENT_INIT}" == "yes" ] && setup_agent_init "${AGENT_DEST}" "${init}" if [ "${AGENT_INIT}" == "yes" ]; then
setup_agent_init "${AGENT_DEST}" "${init}"
else
# Setup systemd service for kata-agent
mkdir -p "${ROOTFS_DIR}/etc/systemd/system/basic.target.wants"
ln -sf "/usr/lib/systemd/system/kata-containers.target" "${ROOTFS_DIR}/etc/systemd/system/basic.target.wants/kata-containers.target"
fi
info "Check init is installed" info "Check init is installed"
[ -x "${init}" ] || [ -L "${init}" ] || die "/sbin/init is not installed in ${ROOTFS_DIR}" [ -x "${init}" ] || [ -L "${init}" ] || die "/sbin/init is not installed in ${ROOTFS_DIR}"