diff --git a/plugins/libvirtwol.plg b/plugins/libvirtwol.plg old mode 100644 new mode 100755 index cec9ed66..90ff9082 --- a/plugins/libvirtwol.plg +++ b/plugins/libvirtwol.plg @@ -3,8 +3,8 @@ - - + + @@ -20,6 +20,12 @@ This Plugin installs libvirt wake on lan for unRaid 6.1 All dependencies are in --> +###2016.03.12 +- add dual package support for 6.1 and 6.2+ +- add python 2.7.11 for 6.2+ +- add libvirt python 1.3.1 for 6.2+ +- move settings to php file and include in vm settings +- move all permissions on scripts to plugin package install ###2016.01.22 - update install and remove scripts - check if config exists @@ -51,14 +57,26 @@ This Plugin installs libvirt wake on lan for unRaid 6.1 All dependencies are in - -https://raw.githubusercontent.com/eschultz/unraid6-nerdpack/master/packages/python-2.7.9-x86_64-1.txz + +&gitURL;/packages/python-2.7.9-x86_64-1.txz 7d5f6d12757c59e5f08ca25bd63aab78 - + + +&gitURL;/source/packages/python-2.7.11-x86_64-2.txz +5ff7e4c8a7ef742fbf12a6ae25914df7 + + + &pkgURL;/libvirt-python-1.2.18-x86_64-1ponce.txz 4198c7784a57d7ff80fb1d53811ceb5e + + +&pkgURL;/libvirt-python-1.3.1-x86_64-1ponce.txz +9a64e4941dd9c7fa3b9c8bf244c9a2d3 + + &pkgURL;/libpcap-1.4.0-x86_64-1.txz cbe651aff5d49d1c3a5a7ad6a4262393 @@ -71,14 +89,11 @@ This Plugin installs libvirt wake on lan for unRaid 6.1 All dependencies are in - @@ -114,18 +129,35 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then rm &plgpath;/&plgname;.md5 exit 1 else - upgradepkg --install-new &plgpath;/&plgname;.txz -fi + if [[ ${version:0:3} == 6.1 ]]; then + echo "\nInstalling dependencies for unRAID 6.1" + upgradepkg --install-new /boot/config/plugins/NerdPack/packages/python-2.7.9-x86_64-1.txz + upgradepkg --install-new &plgpath;/libvirt-python-1.2.18-x86_64-1ponce.txz + fi -# Update file permissions of scripts -chmod +0755 /usr/local/emhttp/plugins/&name;/scripts/* + if [[ ${version:0:3} == 6.2 ]]; then + echo "\nInstalling dependencies for unRAID 6.2" + upgradepkg --install-new /boot/config/plugins/NerdPack/packages/python-2.7.11-x86_64-2.txz + upgradepkg --install-new &plgpath;/libvirt-python-1.3.1-x86_64-1ponce.txz -# add menu to VM Manager -sed -i -- 's/OtherSettings/VMManager:1/g' /usr/local/emhttp/plugins/dynamix.vm.manager/VMSettings.page + # restore VM Manager Menu + sed -i -- 's/VMManager:1/OtherSettings/g' /usr/local/emhttp/plugins/dynamix.vm.manager/VMSettings.page -# Cleaning old source files -find &plgpath;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete -find &plgpath;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete + fi + + upgradepkg --install-new &plgpath;/&plgname;.txz + + #restart event daemon + /dev/null 2>&1 < /dev/null & + sleep 1 + echo "starting libvirtwol..." + setsid /usr/local/emhttp/plugins/libvirtwol/scripts/start >/dev/null 2>&1 < /dev/null & + ]]> + + # Cleaning old source files + find &plgpath;/ -type f -iname "&name;*.txz" ! -iname "*&version;*" -delete + find &plgpath;/ -type f -iname "&name;*.md5" ! -iname "*&version;*" -delete echo "" echo "-----------------------------------------------------------" @@ -135,6 +167,7 @@ echo " Copyright 2016, &author;" echo " Version: &version;" echo "-----------------------------------------------------------" echo "" +fi @@ -154,7 +187,7 @@ removepkg &plgpath;/*.txz rm -f &plgpath;/*.txz # restore VM Manager Menu -sed -i -- 's/VMManager:1/OtherSettings/g' /usr/local/emhttp/plugins/dynamix.vm.manager/VMSettings.page +#sed -i -- 's/VMManager:1/OtherSettings/g' /usr/local/emhttp/plugins/dynamix.vm.manager/VMSettings.page echo "" echo "-----------------------------------------------------------" diff --git a/plugins/libvirtwol.xml b/plugins/libvirtwol.xml index 86700bad..d17acdd1 100644 --- a/plugins/libvirtwol.xml +++ b/plugins/libvirtwol.xml @@ -11,8 +11,14 @@ Wake On Lan for Libvirt. Allows you to recieve a wake on lan packet to wake or s http://lime-technology.com/forum/index.php?topic=44017.0 https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/libvirtwol.png -2016-01-22 +2016-03-12 +###2016.03.12 +- add dual package support for 6.1 and 6.2+ +- add python 2.7.11 for 6.2+ +- add libvirt python 1.3.1 for 6.2+ +- move settings to php file and include in vm settings +- move all permissions on scripts to plugin package install ###2016.01.22 - update install and remove scripts - check if config exists