diff --git a/wol/scripts/wakeonlanservice.sh b/wol/scripts/wakeonlanservice.sh index d3aa387c5e0c61a484aef1fba66184cd22404e30..48fdc1f3ddac5a1b27eceb619734653d65c74f0e 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}}' \ - < /var/lib/dhcp/dhcpd.leases + | sort -u < /var/lib/dhcp/dhcpd.leases } # $1 : file|stdin @@ -101,12 +101,12 @@ do echo "Started 'upgrade_all.sh $subactions' in background on $(date)" | answer elif [[ "$LINE" =~ "reboot" ]] then - mac=$(echo $line | cut -d ' ' -f 2) + mac=$(echo $LINE | cut -d ' ' -f 2) IPS=$(getip $mac | sed -e 's/ /,/g') - for $ip in $IPS + for ip in $IPS do ssh $ip "reboot" done - answer "Redémarrage demandé, attendez une à deux minutes avant d'essayer de vous connecter" + echo "Redémarrage demandé, attendez une à deux minutes avant d'essayer de vous connecter" | answer fi done diff --git a/wol/www/index.php b/wol/www/index.php index 8f03bfce323766bc0845f6c17ae309efba6add98..82c29f489a562abb2a839e77d1583c51a3c3e12e 100644 --- a/wol/www/index.php +++ b/wol/www/index.php @@ -140,12 +140,12 @@ if(!isset($action)){ ?> <form action="index.php" method="post"> <input type="hidden" name="action" value="wake"> - <input type="hidden" name="mac" value="<?php echo $entry[1]; ?>"> + <input type="hidden" name="name" 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]; ?>");'> <input type="hidden" name="action" value="reboot"> - <input type="hidden" name="mac" value="<?php echo $entry[1]; ?>"> + <input type="hidden" name="name" value="<?php echo $entry[1]; ?>"> <input type="submit" value="Redémarrer" title="redémarrer la machine"> </form> <form action="index.php" method="post">