diff --git a/settings.conf b/settings.conf index 4c5a1cc..8f0d9a3 100644 --- a/settings.conf +++ b/settings.conf @@ -74,6 +74,11 @@ instances: module: shellprocess config: shellprocess_generate_dnscrypt_cert_dont_chroot.conf +# - shellprocess@copy_dnscrypt_resolv_conf_chrooted +- id: copy_dnscrypt_resolv_conf_chrooted + module: shellprocess + config: shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf + sequence: - show: - welcome@offline @@ -108,6 +113,7 @@ sequence: - bootloader - services-systemd - shellprocess@generate_dnscrypt_cert_dont_chroot + - shellprocess@copy_dnscrypt_resolv_conf_chrooted - shellprocess@copy_refind_theme_chrooted - shellprocess@install_intel_drivers_chrooted - shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted diff --git a/settings_offline.conf b/settings_offline.conf index 4c5a1cc..8f0d9a3 100644 --- a/settings_offline.conf +++ b/settings_offline.conf @@ -74,6 +74,11 @@ instances: module: shellprocess config: shellprocess_generate_dnscrypt_cert_dont_chroot.conf +# - shellprocess@copy_dnscrypt_resolv_conf_chrooted +- id: copy_dnscrypt_resolv_conf_chrooted + module: shellprocess + config: shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf + sequence: - show: - welcome@offline @@ -108,6 +113,7 @@ sequence: - bootloader - services-systemd - shellprocess@generate_dnscrypt_cert_dont_chroot + - shellprocess@copy_dnscrypt_resolv_conf_chrooted - shellprocess@copy_refind_theme_chrooted - shellprocess@install_intel_drivers_chrooted - shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted diff --git a/settings_online.conf b/settings_online.conf index e423ec7..562ff72 100644 --- a/settings_online.conf +++ b/settings_online.conf @@ -75,6 +75,11 @@ instances: module: shellprocess config: shellprocess_generate_dnscrypt_cert_dont_chroot.conf +# - shellprocess@copy_dnscrypt_resolv_conf_chrooted +- id: copy_dnscrypt_resolv_conf_chrooted + module: shellprocess + config: shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf + sequence: - show: - welcome@online @@ -110,6 +115,7 @@ sequence: - bootloader - services-systemd - shellprocess@generate_dnscrypt_cert_dont_chroot + - shellprocess@copy_dnscrypt_resolv_conf_chrooted - shellprocess@copy_refind_theme_chrooted - shellprocess@install_nvidia_drivers_chrooted - shellprocess@install_intel_drivers_chrooted diff --git a/src/modules/shellprocess/shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf b/src/modules/shellprocess/shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf new file mode 100644 index 0000000..407f5ff --- /dev/null +++ b/src/modules/shellprocess/shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf @@ -0,0 +1,14 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 + +--- + +i18n: + name: "Copying the theme for the boot menu" + name[ru]: "Копирование темы оформления для загрузочного меню" + +dontChroot: false + +script: + - command: "-/usr/local/bin/dnscrypt-proxy-resolv.conf.sh" + timeout: 180 diff --git a/src/modules/shellprocess/shellprocess_final_chrooted.conf b/src/modules/shellprocess/shellprocess_final_chrooted.conf index a301537..cb1c4c8 100644 --- a/src/modules/shellprocess/shellprocess_final_chrooted.conf +++ b/src/modules/shellprocess/shellprocess_final_chrooted.conf @@ -148,3 +148,8 @@ script: - "-rm -rf /usr/local/bin/*" - '-sed -i /etc/sddm.conf.d/kde_settings.conf -e "s/liveuser//"' + + - "-rm /etc/systemd/system/mount-data-flash.service" + - "-rm /etc/systemd/system/multi-user.target.wants/mount-data-flash.service" + - "-rm /etc/systemd/system/dnscrypt-proxy-resolv.conf.service" + - "-rm /etc/systemd/system/network-online.target.wants/dnscrypt-proxy-resolv.conf.service"