From 576888bd316b8073b709039109011ed1d0276514 Mon Sep 17 00:00:00 2001 From: Radek Vykydal Date: Fri, 7 Sep 2018 09:40:31 +0200 Subject: [PATCH] Revert "Don't activate default auto connections after switchroot" This reverts commit 044d7381a20ac520837c33ecf7fb56fd2e6bdf5b. --- .../config_files/common/90-anaconda-no-auto-default.conf | 2 -- share/templates.d/99-generic/runtime-postinstall.tmpl | 1 - 2 files changed, 3 deletions(-) delete mode 100644 share/templates.d/99-generic/config_files/common/90-anaconda-no-auto-default.conf diff --git a/share/templates.d/99-generic/config_files/common/90-anaconda-no-auto-default.conf b/share/templates.d/99-generic/config_files/common/90-anaconda-no-auto-default.conf deleted file mode 100644 index 06b53d81..00000000 --- a/share/templates.d/99-generic/config_files/common/90-anaconda-no-auto-default.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -no-auto-default=* diff --git a/share/templates.d/99-generic/runtime-postinstall.tmpl b/share/templates.d/99-generic/runtime-postinstall.tmpl index 1d019d1c..535e5b18 100644 --- a/share/templates.d/99-generic/runtime-postinstall.tmpl +++ b/share/templates.d/99-generic/runtime-postinstall.tmpl @@ -76,7 +76,6 @@ mkdir etc/NetworkManager/conf.d install ${configdir}/91-anaconda-autoconnect-slaves.conf etc/NetworkManager/conf.d install ${configdir}/vconsole.conf etc install ${configdir}/92-anaconda-loglevel-debug.conf etc/NetworkManager/conf.d -install ${configdir}/90-anaconda-no-auto-default.conf etc/NetworkManager/conf.d ## set up sshd install ${configdir}/sshd_config.anaconda etc/ssh