Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

network: start dnsconfd in initramfs #6200

Open
wants to merge 1 commit into
base: rhel-10
Choose a base branch
from
Open

network: start dnsconfd in initramfs #6200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dracut/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dist_dracut_SCRIPTS = module-setup.sh \
anaconda-copy-cmdline.sh \
anaconda-copy-dhclient.sh \
anaconda-copy-prefixdevname.sh \
anaconda-start-dnsconfd.sh \
anaconda-ifcfg.sh \
anaconda-set-kernel-hung-timeout.sh \
anaconda-error-reporting.sh \
Expand Down
44 changes: 44 additions & 0 deletions dracut/anaconda-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ parse_kickstart() {
unset CMDLINE # re-read the commandline
. /tmp/ks.info # save the parsed kickstart
[ -e "$parsed_kickstart" ] && cp "$parsed_kickstart" /run/install/ks.cfg
start_dnsconfd "The certificates may have been imported."
}

# print a list of net devices that dracut says are set up.
Expand Down Expand Up @@ -384,6 +385,10 @@ run_kickstart() {
udevadm trigger --action=change --subsystem-match=block
fi

if [ "$do_net" ]; then
start_dnsconfd "The network may have become required"
fi

# net: re-run online hooks
if [ "$do_net" ]; then
# If NetworkManager is used in initramfs
Expand Down Expand Up @@ -452,3 +457,42 @@ wait_for_disks() {
DISKS_WAIT_RETRIES=$((DISKS_WAIT_DELAY * 2))
echo "[ \"\$main_loop\" -ge \"$DISKS_WAIT_RETRIES\" ]" > "$finished_hook"
}

# This script should start dnsconfd if all required conditions to run it are met
start_dnsconfd() {

local reason="$1"
local start="yes"

echo "Attempting to start dnsconfd. Reason: ${reason}"

# dnsconfd is explicitly required by kernel boot option
dns_backend=$(getarg rd.net.dns-backend=)
if [ "${dns_backend}" != "dnsconfd" ]; then
echo "Attempting to start dnsconfd. Not starting because not required by kernel boot option."
start="no"
fi

# Network is required in initramfs
getargbool 0 rd.neednet && neednet=1
if [ ! -e "/tmp/net.ifaces" ] && [ "${neednet}" != "1" ]; then
echo "Attempting to start dnsconfd. Not starting because network is not required (yet)."
start="no"
fi

# It is not possible certificates for dnsconfd will be imported after start by kickstart
kickstart="$(getarg inst.ks=)"
# If kickstart has not been parsed yet && is reqiured by boot options
if [ ! -e /run/install/ks.cfg ] && ([ -n "$kickstart" ] || getargbool 0 inst.ks); then
echo "Attempting to start dnsconfd. Not starting because certificates can be imported via kickstart later."
start="no"
fi

if [ "${start}" == "yes" ]; then
echo "Attempting to start dnsconfd. Starting."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can just write it starting as this shouldn't be just an attempt.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted make easier matching the message to the previous related log message Attempting to start dnsconfd. Reason: ${reason} when looking at the log.

systemctl start --no-block unbound.service
return 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want to have return $? instead to catch possible failure?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'd care more about the information 'should the service be started now?'. The return value is not needed anywhere anyway. I think at this point it is just too early complicate the things by figuring stable expected return values.

else
return 1
fi
}
10 changes: 10 additions & 0 deletions dracut/anaconda-start-dnsconfd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
# Attempt to start dnsconfd after boot options are parsed.
# The script needs to be run only after boot options are parsed,
# (parse-anaconda-* cmdline hooks are finished).
# There are also other attempts to start dnsconfd with start_dnsconfd
# called after parsing kickstart, see anaconda-lib.

. /lib/anaconda-lib.sh
start_dnsconfd "Anaconda boot options have been parsed"

1 change: 1 addition & 0 deletions dracut/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ install() {
inst_hook cmdline 26 "$moddir/parse-anaconda-kickstart.sh"
inst_hook cmdline 27 "$moddir/parse-anaconda-repo.sh"
inst_hook cmdline 28 "$moddir/parse-anaconda-net.sh"
inst_hook cmdline 99 "$moddir/anaconda-start-dnsconfd.sh"
inst_hook pre-udev 30 "$moddir/anaconda-modprobe.sh"
inst_hook pre-trigger 50 "$moddir/repo-genrules.sh"
inst_hook pre-trigger 50 "$moddir/kickstart-genrules.sh"
Expand Down
Loading