From aa8aa80fa5d9c3ea21d153005fa5abd66eb5bee7 Mon Sep 17 00:00:00 2001 From: eichehome Date: Wed, 29 Mar 2023 16:35:41 +0200 Subject: [PATCH] fixed coping of files --- base.sh | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/base.sh b/base.sh index 8e31dc2..74f4bb7 100644 --- a/base.sh +++ b/base.sh @@ -121,14 +121,18 @@ if [[ $configuration == 1 ]]; then systemctl enable sshd # Netzwerk # Ethernet + $ethernet_network=$(find / -type f -name 20-ethernet.network | grep configs) cp ./configs/20-ethernet.network /etc/systemd/network/ # Wlan - cp ./configs/20-wlan.network /etc/systemd/network/ + $wlan_network=$(find / -type f -name 20-wlan.network | grep configs) + cp $wlan_network /etc/systemd/network/ # Wwan (Mobilefunk) - cp ./configs/20-wwan.network /etc/systemd/network/ + $wwan_network=$(find / -type f -name 20-wwan.network | grep configs) + cp $wwan_network /etc/systemd/network/ elif [[ $configuration == 2 ]]; then systemctl enable NetworkManager - cp ./configs/wifi_backend.conf /etc/NetworkManager/conf.d/ + $wifi_backend_conf=$(find / -type f -name wifi_backend.conf | grep configs) + cp $wifi_backend_conf /etc/NetworkManager/conf.d/ fi systemctl enable systemd-resolved @@ -165,11 +169,13 @@ fi bootctl install # Bootloaderconfig +$wifi_backend_conf=$(find / -type f -name | grep configs) cp ./configs/loader.conf /boot/loader/ if [[ $kernel == 1 || $kernel == 2 || $kernel == 3 || $kernel == 4 ]]; then # Entry Arch - cp ./configs/arch.conf /boot/loader/entries/ + $arch_conf=$(find / -type f -name arch.conf | grep configs) + cp $arch_conf /boot/loader/entries/ if [[ $vendor == 1 ]]; then sed -i 's/#AMD//' /boot/loader/entries/arch.conf elif [[ $vendor == 2 ]]; then @@ -178,7 +184,8 @@ if [[ $kernel == 1 || $kernel == 2 || $kernel == 3 || $kernel == 4 ]]; then if [[ $kernel == 2 || $kernel == 4 || $kernel == 5 ]]; then # Entry Arch LTS - cp ./configs/arch-lts.conf /boot/loader/entries/ + $arch_lts_conf=$(find / -type f -name arch-lts.conf | grep configs) + cp $arch_lts_conf /boot/loader/entries/ if [[ $vendor == 1 ]]; then sed -i 's/#AMD//' /boot/loader/entries/arch-lts.conf elif [[ $vendor == 2 ]]; then @@ -188,7 +195,8 @@ fi if [[ $kernel == 3 || $kernel == 4 || $kernel == 5 ]]; then # Entry Arch Zen - cp ./configs/arch-zen.conf /boot/loader/entries/ + $arch_zen_conf=$(find / -type f -name arch-zen.conf | grep configs) + cp $arch_zen_conf /boot/loader/entries/ if [[ $vendor == 1 ]]; then sed -i 's/#AMD//' /boot/loader/entries/arch-zen.conf elif [[ $vendor == 2 ]]; then @@ -198,6 +206,7 @@ fi if [[ $kernel == 1 || $kernel == 2 || $kernel == 3 || $kernel == 4 ]]; then # Entry Arch Fallback + $arch_fallback_conf=$(find / -type f -name arch-fallback.conf | grep configs) cp ./configs/arch-fallback.conf /boot/loader/entries/ if [[ $vendor == 1 ]]; then sed -i 's/#AMD//' /boot/loader/entries/arch-fallback.conf @@ -208,7 +217,8 @@ fi if [[ $kernel == 2 || $kernel == 4 || $kernel == 5 ]]; then # Entry Arch LTS Fallback - cp ./configs/arch-lts-fallback.conf /boot/loader/entries/ + $arch_lts_fallback_conf=$(find / -type f -name arch-lts-fallback.conf | grep configs) + cp $arch_lts_fallback_conf /boot/loader/entries/ if [[ $vendor == 1 ]]; then sed -i 's/#AMD//' /boot/loader/entries/arch-lts-fallback.conf elif [[ $vendor == 2 ]]; then @@ -218,7 +228,8 @@ fi if [[ $kernel == 3 || $kernel == 4 || $kernel == 5 ]]; then # Entry Arch Zen Fallback - cp ./configs/arch-zen-fallback.conf /boot/loader/entries/ + $arch_zen_fallback_conf=$(find / -type f -name arch-zen-fallback.conf | grep configs) + cp $arch_zen_fallback_conf /boot/loader/entries/ if [[ $vendor == 1 ]]; then sed -i 's/#AMD//' /boot/loader/entries/arch-zen-fallback.conf elif [[ $vendor == 2 ]]; then