summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2018-09-10 21:08:15 +0200
committertorben2018-09-10 21:08:15 +0200
commit1f53c16d876a36c92a2d68d0e65ef6de6b89cef4 (patch)
tree7b5acb58f8d281809262f67865f64a8c1a7fabea
parentfix wrong driver recognation. (diff)
downloadsystemd-init-1f53c16d876a36c92a2d68d0e65ef6de6b89cef4.tar.gz
systemd-init-1f53c16d876a36c92a2d68d0e65ef6de6b89cef4.tar.xz
systemd-init-1f53c16d876a36c92a2d68d0e65ef6de6b89cef4.zip
fix.
-rw-r--r--modules.d/dnbd-root-filesystem/configuration/dnbd/alt-servers4
-rwxr-xr-xmodules.d/dnbd-root-filesystem/hooks/update-boot-files.sh3
-rwxr-xr-xmodules.d/systemd-networkd-ext/hooks/wait-for-network.sh4
3 files changed, 5 insertions, 6 deletions
diff --git a/modules.d/dnbd-root-filesystem/configuration/dnbd/alt-servers b/modules.d/dnbd-root-filesystem/configuration/dnbd/alt-servers
index 7d594399..49d5007c 100644
--- a/modules.d/dnbd-root-filesystem/configuration/dnbd/alt-servers
+++ b/modules.d/dnbd-root-filesystem/configuration/dnbd/alt-servers
@@ -1,11 +1,11 @@
; Enforce client to use this proxy only by avoiding to propagate alt-server
; configuration to client.
+; UNI LAN (external lan adapter)
+-10.21.9.111
; Fritzbox wlanboot (LAN)
192.168.188.21
; Fritzbox wlanboot (W-LAN)
192.168.188.20
-; UNI LAN (external adapter)
--10.21.9.111
; Home Lan
-192.168.0.113
; Virtual Machine
diff --git a/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh b/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh
index 45973cbf..d55233d3 100755
--- a/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh
+++ b/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh
@@ -218,8 +218,7 @@ LABEL arch
LINUX ../$kernel_file_path
APPEND $(
cat /proc/cmdline | \
- sed 's/ WIRELESS_BOOTIF=false//' | \
- sed 's/10.21.9.111/192.168.188.20/g')
+ sed 's/ WIRELESS_BOOTIF=false//')
INITRD ../$initramfs_file_path
EOF
boot_partition_mounted=true
diff --git a/modules.d/systemd-networkd-ext/hooks/wait-for-network.sh b/modules.d/systemd-networkd-ext/hooks/wait-for-network.sh
index f294451e..6237d17d 100755
--- a/modules.d/systemd-networkd-ext/hooks/wait-for-network.sh
+++ b/modules.d/systemd-networkd-ext/hooks/wait-for-network.sh
@@ -41,7 +41,7 @@ if (( ${#network_interface_names[@]} > 0 )); then
for name in "${network_interface_names[@]}"; do
/lib/systemd/systemd-networkd-wait-online \
--interface "$name" \
- --timeout 15 \
+ --timeout 10 \
&
subprocess_ids+=($!)
done
@@ -62,7 +62,7 @@ if (( ${#network_interface_names[@]} > 0 )); then
if \
/lib/systemd/systemd-networkd-wait-online \
--interface wireless \
- --timeout 15
+ --timeout 20
then
online=true
fi