[PATCH] Use the same /etc/resolve.conf in kdump initrd if it's managed manually

[Coiby Xu]

Resolves: https://issues.redhat.com/browse/RHEL-11897

Previously fix 0177e248 ("Use the same /etc/resolve.conf in kdump initrd
if it's managed manually") is problematic,
   1) it generated .conf file unrecognized by NetowrkManager ;
   2) this .conf file was installed to current file system instead of to the kdump initrd;
   3) this incorrect .conf file prevented the starting of NetworkManager.

This patch fixes the above issues and also suppresses a harmless warning
when systemd-resolved.service doesn't exist,

# systemctl -q is-enabled systemd-resolved
    Failed to get unit file state for systemd-resolved.service: No such file or directory

Fixes: 0177e248 ("Use the same /etc/resolve.conf in kdump initrd if it's managed manually")
Reported-by: Jie Li 
Cc: Dave Young 
Signed-off-by: Coiby Xu 
---
 dracut-module-setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index ab6dc4f1..1dc88dcc 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -583,10 +583,10 @@ kdump_install_resolv_conf() {
     #
     # [1] https://bugzilla.gnome.org/show_bug.cgi?id=690404
     # [2] https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/htm...
-    systemctl -q is-enabled systemd-resolved && return 0
+    systemctl -q is-enabled systemd-resolved 2> /dev/null && return 0
     inst "$_resolv_conf"
     if NetworkManager --print-config | grep -qs "^dns=none"; then
-        echo "[main]\ndns=none" > "$_nm_conf_dir"/90-dns-none.conf
+        printf "[main]\ndns=none\n" > "${initdir}/${_nm_conf_dir}"/90-dns-none.conf
     fi
 }

[Dave Young]

On Tue, 26 Dec 2023 at 11:38, Coiby Xu  wrote:
> Resolves: https://issues.redhat.com/browse/RHEL-11897
>
> Previously fix 0177e248 ("Use the same /etc/resolve.conf in kdump initrd
> if it's managed manually") is problematic,
> it generated .conf file unrecognized by NetowrkManager ;
> this .conf file was installed to current file system instead of to the kdump initrd;
> this incorrect .conf file prevented the starting of NetworkManager.
>
> This patch fixes the above issues and also suppresses a harmless warning
> when systemd-resolved.service doesn't exist,
> # systemctl -q is-enabled systemd-resolved
> Failed to get unit file state for systemd-resolved.service: No such file or directory
>
> Fixes: 0177e248 ("Use the same /etc/resolve.conf in kdump initrd if it's managed manually")
> Reported-by: Jie Li 
> Cc: Dave Young 
> Signed-off-by: Coiby Xu
>
> dracut-module-setup.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
> index ab6dc4f1..1dc88dcc 100755
> --- a/dracut-module-setup.sh
> +++ b/dracut-module-setup.sh
> @@ -583,10 +583,10 @@ kdump_install_resolv_conf() {
>      #
>      # [1] https://bugzilla.gnome.org/show_bug.cgi?id=690404
>      # [2] https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/htm...
> systemctl -q is-enabled systemd-resolved && return 0
> systemctl -q is-enabled systemd-resolved 2> /dev/null && return 0
> inst "$_resolv_conf"
> if NetworkManager --print-config | grep -qs "^dns=none"; then
>    echo "[main]\ndns=none" > "$_nm_conf_dir"/90-dns-none.conf
>    printf "[main]\ndns=none\n" > "${initdir}/${_nm_conf_dir}"/90-dns-none.conf
> fi
>
> }
>
> --
> 2.43.0

Reviewed-by: Dave Young

Thanks!

[Coiby Xu]

On Tue, Dec 26, 2023 at 12:05:33PM +0800, Dave Young wrote:
> On Tue, 26 Dec 2023 at 11:38, Coiby Xu  wrote:
> > Resolves: https://issues.redhat.com/browse/RHEL-11897
> >
> > Previously fix 0177e248 ("Use the same /etc/resolve.conf in kdump initrd
> > if it's managed manually") is problematic,
> > it generated .conf file unrecognized by NetowrkManager ;
> > this .conf file was installed to current file system instead of to the kdump initrd;
> > this incorrect .conf file prevented the starting of NetworkManager.
> >
> > This patch fixes the above issues and also suppresses a harmless warning
> > when systemd-resolved.service doesn't exist,
> > # systemctl -q is-enabled systemd-resolved
> > Failed to get unit file state for systemd-resolved.service: No such file or directory
> >
> > Fixes: 0177e248 ("Use the same /etc/resolve.conf in kdump initrd if it's managed manually")
> > Reported-by: Jie Li 
> > Cc: Dave Young 
> > Signed-off-by: Coiby Xu
> >
> > dracut-module-setup.sh | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
> > index ab6dc4f1..1dc88dcc 100755
> > --- a/dracut-module-setup.sh
> > +++ b/dracut-module-setup.sh
> > @@ -583,10 +583,10 @@ kdump_install_resolv_conf() {
> >      #
> >      # [1] https://bugzilla.gnome.org/show_bug.cgi?id=690404
> >      # [2] https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/htm...
> > systemctl -q is-enabled systemd-resolved && return 0
> > systemctl -q is-enabled systemd-resolved 2> /dev/null && return 0
> > inst "$_resolv_conf"
> > if NetworkManager --print-config | grep -qs "^dns=none"; then
> >    echo "[main]\ndns=none" > "$_nm_conf_dir"/90-dns-none.conf
> >    printf "[main]\ndns=none\n" > "${initdir}/${_nm_conf_dir}"/90-dns-none.conf
> > fi
> >
> > }
> >
> > --
> > 2.43.0
>
> Reviewed-by: Dave Young
>
> Thanks!

Patch merged, thanks for reviewing the patch!