From 6597d46f41dbcb9ba34e77089b88fb9d9b6c54da Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Mon, 30 Sep 2019 14:34:24 +0200
Subject: [PATCH] Fix wakeonlan break after reboot
---
wol/scripts/wakeonlanservice.sh | 4 ++--
wol/www/index.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/wol/scripts/wakeonlanservice.sh b/wol/scripts/wakeonlanservice.sh
index 48fdc1f..b04dc49 100755
--- a/wol/scripts/wakeonlanservice.sh
+++ b/wol/scripts/wakeonlanservice.sh
@@ -18,7 +18,7 @@
getip(){
awk '/^lease/{IP=$2} /hardware ethernet/{gsub(";","",$3);if($3 == "'$1'"){print IP}}' \
- | sort -u < /var/lib/dhcp/dhcpd.leases
+ < /var/lib/dhcp/dhcpd.leases
}
# $1 : file|stdin
@@ -105,7 +105,7 @@ do
IPS=$(getip $mac | sed -e 's/ /,/g')
for ip in $IPS
do
- ssh $ip "reboot"
+ nohup ssh $ip "reboot" &
done
echo "Redémarrage demandé, attendez une à deux minutes avant d'essayer de vous connecter" | answer
fi
diff --git a/wol/www/index.php b/wol/www/index.php
index 82c29f4..f060af1 100644
--- a/wol/www/index.php
+++ b/wol/www/index.php
@@ -140,7 +140,7 @@ if(!isset($action)){
?>
<form action="index.php" method="post">
<input type="hidden" name="action" value="wake">
- <input type="hidden" name="name" value="<?php echo $entry[1]; ?>">
+ <input type="hidden" name="mac" value="<?php echo $entry[1]; ?>">
<input type="submit" value="Démarrer" title="Démarrer la machine">
</form>
<form action="index.php" method="post" onsubmit='return confirm("Êtes-vous sûr de vouloir redémarrer la machine <? echo $entry[2]; ?>");'>
--
GitLab