Fix issue: systemctl daemon-reload would sporadically cause udev handler fail
This commit is contained in:
parent
105f47d38f
commit
a112bb97c2
@ -111,7 +111,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
|
|||||||
[ -d $TRUSTED_GPG_DIR ] && [ ! -z "$(ls $TRUSTED_GPG_DIR)" ] && sudo cp $TRUSTED_GPG_DIR/* ${FILESYSTEM_ROOT}/etc/apt/trusted.gpg.d/
|
[ -d $TRUSTED_GPG_DIR ] && [ ! -z "$(ls $TRUSTED_GPG_DIR)" ] && sudo cp $TRUSTED_GPG_DIR/* ${FILESYSTEM_ROOT}/etc/apt/trusted.gpg.d/
|
||||||
|
|
||||||
## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
|
## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
|
||||||
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
|
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
|
||||||
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
|
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
|
||||||
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until,apt-multiple-retries} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
|
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until,apt-multiple-retries} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
|
||||||
|
|
||||||
@ -294,7 +294,7 @@ then
|
|||||||
## Install Kubernetes master
|
## Install Kubernetes master
|
||||||
echo '[INFO] Install kubernetes master'
|
echo '[INFO] Install kubernetes master'
|
||||||
install_kubernetes ${MASTER_KUBERNETES_VERSION}
|
install_kubernetes ${MASTER_KUBERNETES_VERSION}
|
||||||
|
|
||||||
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -fsSL \
|
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -fsSL \
|
||||||
https://packages.microsoft.com/keys/microsoft.asc | \
|
https://packages.microsoft.com/keys/microsoft.asc | \
|
||||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
|
sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
|
||||||
@ -309,7 +309,7 @@ then
|
|||||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove gnupg
|
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove gnupg
|
||||||
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/cri-dockerd.deb -fsSL \
|
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/cri-dockerd.deb -fsSL \
|
||||||
https://github.com/Mirantis/cri-dockerd/releases/download/v${MASTER_CRI_DOCKERD}/cri-dockerd_${MASTER_CRI_DOCKERD}.3-0.debian-${IMAGE_DISTRO}_amd64.deb
|
https://github.com/Mirantis/cri-dockerd/releases/download/v${MASTER_CRI_DOCKERD}/cri-dockerd_${MASTER_CRI_DOCKERD}.3-0.debian-${IMAGE_DISTRO}_amd64.deb
|
||||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-dockerd.deb
|
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-dockerd.deb
|
||||||
sudo LANG=C chroot $FILESYSTEM_ROOT rm -f /tmp/cri-dockerd.deb
|
sudo LANG=C chroot $FILESYSTEM_ROOT rm -f /tmp/cri-dockerd.deb
|
||||||
else
|
else
|
||||||
echo '[INFO] Skipping Install kubernetes master'
|
echo '[INFO] Skipping Install kubernetes master'
|
||||||
@ -447,6 +447,9 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
|
|||||||
systemd-sysv \
|
systemd-sysv \
|
||||||
ntp
|
ntp
|
||||||
|
|
||||||
|
# Workaround to fix issue https://github.com/systemd/systemd/issues/24668.
|
||||||
|
sudo cp files/image_config/systemd/systemd-udevd/systemd-udevd.service $FILESYSTEM_ROOT/lib/systemd/system/systemd-udevd.service
|
||||||
|
|
||||||
if [[ $TARGET_BOOTLOADER == grub ]]; then
|
if [[ $TARGET_BOOTLOADER == grub ]]; then
|
||||||
if [[ $CONFIGURED_ARCH == amd64 ]]; then
|
if [[ $CONFIGURED_ARCH == amd64 ]]; then
|
||||||
GRUB_PKG=grub-pc-bin
|
GRUB_PKG=grub-pc-bin
|
||||||
@ -634,10 +637,10 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# #################
|
# #################
|
||||||
# secure boot
|
# secure boot
|
||||||
# #################
|
# #################
|
||||||
if [[ $SECURE_UPGRADE_MODE == 'dev' || $SECURE_UPGRADE_MODE == "prod" && $SONIC_ENABLE_SECUREBOOT_SIGNATURE != 'y' ]]; then
|
if [[ $SECURE_UPGRADE_MODE == 'dev' || $SECURE_UPGRADE_MODE == "prod" && $SONIC_ENABLE_SECUREBOOT_SIGNATURE != 'y' ]]; then
|
||||||
# note: SONIC_ENABLE_SECUREBOOT_SIGNATURE is a feature that signing just kernel,
|
# note: SONIC_ENABLE_SECUREBOOT_SIGNATURE is a feature that signing just kernel,
|
||||||
# SECURE_UPGRADE_MODE is signing all the boot component including kernel.
|
# SECURE_UPGRADE_MODE is signing all the boot component including kernel.
|
||||||
# its required to do not enable both features together to avoid conflicts.
|
# its required to do not enable both features together to avoid conflicts.
|
||||||
echo "Secure Boot support build stage: Starting .."
|
echo "Secure Boot support build stage: Starting .."
|
||||||
@ -646,14 +649,14 @@ if [[ $SECURE_UPGRADE_MODE == 'dev' || $SECURE_UPGRADE_MODE == "prod" && $SONIC_
|
|||||||
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
|
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
|
||||||
shim-unsigned \
|
shim-unsigned \
|
||||||
grub-efi
|
grub-efi
|
||||||
|
|
||||||
if [ ! -f $SECURE_UPGRADE_SIGNING_CERT ]; then
|
if [ ! -f $SECURE_UPGRADE_SIGNING_CERT ]; then
|
||||||
echo "Error: SONiC SECURE_UPGRADE_SIGNING_CERT=$SECURE_UPGRADE_SIGNING_CERT key missing"
|
echo "Error: SONiC SECURE_UPGRADE_SIGNING_CERT=$SECURE_UPGRADE_SIGNING_CERT key missing"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $SECURE_UPGRADE_MODE == 'dev' ]]; then
|
if [[ $SECURE_UPGRADE_MODE == 'dev' ]]; then
|
||||||
# development signing & verification
|
# development signing & verification
|
||||||
|
|
||||||
if [ ! -f $SECURE_UPGRADE_DEV_SIGNING_KEY ]; then
|
if [ ! -f $SECURE_UPGRADE_DEV_SIGNING_KEY ]; then
|
||||||
echo "Error: SONiC SECURE_UPGRADE_DEV_SIGNING_KEY=$SECURE_UPGRADE_DEV_SIGNING_KEY key missing"
|
echo "Error: SONiC SECURE_UPGRADE_DEV_SIGNING_KEY=$SECURE_UPGRADE_DEV_SIGNING_KEY key missing"
|
||||||
|
@ -0,0 +1,37 @@
|
|||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
#
|
||||||
|
# This file is part of systemd.
|
||||||
|
#
|
||||||
|
# systemd is free software; you can redistribute it and/or modify it
|
||||||
|
# under the terms of the GNU Lesser General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2.1 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
|
||||||
|
[Unit]
|
||||||
|
Description=Rule-based Manager for Device Events and Files
|
||||||
|
Documentation=man:systemd-udevd.service(8) man:udev(7)
|
||||||
|
DefaultDependencies=no
|
||||||
|
After=systemd-sysusers.service systemd-hwdb-update.service
|
||||||
|
Before=sysinit.target
|
||||||
|
ConditionPathIsReadWrite=/sys
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=notify
|
||||||
|
# Note that udev will reset the value internally for its workers
|
||||||
|
OOMScoreAdjust=-1000
|
||||||
|
Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
|
||||||
|
Restart=always
|
||||||
|
RestartSec=0
|
||||||
|
ExecStart=/lib/systemd/systemd-udevd
|
||||||
|
ExecReload=udevadm control --reload --timeout 0
|
||||||
|
KillMode=mixed
|
||||||
|
TasksMax=infinity
|
||||||
|
PrivateMounts=yes
|
||||||
|
ProtectHostname=yes
|
||||||
|
MemoryDenyWriteExecute=yes
|
||||||
|
RestrictAddressFamilies=AF_UNIX AF_NETLINK AF_INET AF_INET6
|
||||||
|
RestrictRealtime=yes
|
||||||
|
RestrictSUIDSGID=yes
|
||||||
|
LockPersonality=yes
|
||||||
|
IPAddressDeny=any
|
||||||
|
WatchdogSec=3min
|
Reference in New Issue
Block a user