From 363e6e1a1e08759ebad0d16753060a564a7226e6 Mon Sep 17 00:00:00 2001 From: torben Date: Fri, 7 Sep 2018 10:18:39 +0200 Subject: fix. --- .../hooks/prepare-network-service-in-newroot.sh | 10 ++++++++-- modules.d/systemd-networkd-ext/module-setup.sh | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh b/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh index 8aa8feda..8883aaa1 100755 --- a/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh +++ b/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh @@ -97,8 +97,14 @@ if $SLX_ONLINE; then # "$NEWROOT/usr/lib/systemd/system/multi-user.target.wants/restart-wireless-daemon.service" # Login to tty1 version, works: # TODO remove "false" if pre-caching is working. - echo -e "false && [ ! -f /tmp/wireless-daemon-restarted ] && systemctl start restart-wireless-daemon.service && touch /tmp/wireless-daemon-restarted\nwget --output-document - http://..../BOOTED\n$(cat "$NEWROOT/root/.bash_profile")" \ - > "$NEWROOT/root/.bash_profile" + cat << EOF >"$NEWROOT/root/.bash_profile" +wget --output-document - http://..../BOOTED +if false && [ ! -f /tmp/wireless-daemon-restarted ]; then + systemctl start restart-wireless-daemon.service + touch /tmp/wireless-daemon-restarted +fi +$(cat "$NEWROOT/root/.bash_profile") +EOF # Stops daemon at boot yet. #bl.logging.info \ # Link service \"$service_file_path\" to \ diff --git a/modules.d/systemd-networkd-ext/module-setup.sh b/modules.d/systemd-networkd-ext/module-setup.sh index 2fab6d8e..050d3307 100755 --- a/modules.d/systemd-networkd-ext/module-setup.sh +++ b/modules.d/systemd-networkd-ext/module-setup.sh @@ -392,9 +392,9 @@ then bl.logging.warn File \\"\$path\\" not available for pre-caching. fi done - # Needed to perform to inform the authentication server about + # NOTE: Needed to perform to inform the authentication server about # deauthenticating the passed connection coming from the initramfs. - cp --force /usr/lib/libaircrack* "\$NEWROOT/usr/lib" + #cp --force /usr/lib/libaircrack* "\$NEWROOT/usr/lib" # NOTE: This would allow to traverse the full root target tree in offline # mode: #tree "\$NEWROOT" 1>/dev/null -- cgit v1.2.3-55-g7522