diff options
| author | Javier Sánchez Parra <jsanchez@soleta.eu> | 2019-01-28 10:22:57 +0100 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2019-01-29 14:55:27 +0100 |
| commit | 2b00219981fbc33f1131390a6a051e7d9f2e8295 (patch) | |
| tree | d1969ea61651ab9dab45037fd4ffaa8decd0c2b9 /installer | |
| parent | 3f59ea6b3143ba850ce03161d08c2813d9f352f4 (diff) | |
#892: Use ogAdmServer Wake on Lan
* gestor_Comando.php only execute wakeonlan_repo.php when wake up command is called.
* wakeonlan_repo.php send new needed parameters for ogAdmServer WoL.
* repository.php use ogAdmServer WoL instead of wakeonlan perl script.
* opengnsys_installer.sh and opengnsys_update.sh don't have wakeonlan perl script dependency anymore.
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
#
# Date: Mon Jan 28 10:22:57 2019 +0100
#
# On branch devel
# Your branch is ahead of 'origin/devel' by 1 commit.
# (use "git push" to publish your local commits)
#
# Changes to be committed:
# modified: admin/WebConsole/comandos/gestores/gestor_Comandos.php
# modified: admin/WebConsole/comandos/gestores/wakeonlan_repo.php
# modified: admin/WebConsole/rest/repository.php
# modified: installer/opengnsys_installer.sh
# modified: installer/opengnsys_update.sh
#
# Untracked files:
# 0001-892-Use-ogAdmServer-Wake-on-Lan.patch
# 0001-892-Use-ogAdmServer-Wake-on-Lan.zip
#
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/opengnsys_installer.sh | 2 | ||||
| -rwxr-xr-x | installer/opengnsys_update.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 17d36253..fd07d843 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -170,7 +170,7 @@ OSVERSION="${OSVERSION%%.*}" # Configuración según la distribución GNU/Linux (usar minúsculas). case "$OSDISTRIB" in ubuntu|debian|linuxmint) - DEPENDENCIES=( subversion apache2 php php-ldap php-fpm mysql-server php-mysql isc-dhcp-server bittorrent tftp-hpa tftpd-hpa xinetd build-essential g++-multilib libmysqlclient-dev wget curl doxygen graphviz bittornado ctorrent samba rsync unzip netpipes debootstrap schroot squashfs-tools btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq wakeonlan udpcast libev-dev shim-signed grub-efi-amd64-signed ) + DEPENDENCIES=( subversion apache2 php php-ldap php-fpm mysql-server php-mysql isc-dhcp-server bittorrent tftp-hpa tftpd-hpa xinetd build-essential g++-multilib libmysqlclient-dev wget curl doxygen graphviz bittornado ctorrent samba rsync unzip netpipes debootstrap schroot squashfs-tools btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq udpcast libev-dev shim-signed grub-efi-amd64-signed ) UPDATEPKGLIST="apt-get update" INSTALLPKG="apt-get -y install --force-yes" CHECKPKG="dpkg -s \$package 2>/dev/null | grep Status | grep -qw install" diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index 8880fd6f..09142865 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -118,7 +118,7 @@ function autoConfigure() # Configuración según la distribución de Linux. if [ -f /etc/debian_version ]; then # Distribución basada en paquetes Deb. - DEPENDENCIES=( curl rsync btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq wakeonlan udpcast libev-dev shim-signed grub-efi-amd64-signed php-fpm ) + DEPENDENCIES=( curl rsync btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq udpcast libev-dev shim-signed grub-efi-amd64-signed php-fpm ) # Paquete correcto para realpath. [ -z "$(apt-cache pkgnames realpath)" ] && DEPENDENCIES=( ${DEPENDENCIES[@]//realpath/coreutils} ) UPDATEPKGLIST="add-apt-repository -y ppa:ondrej/php; apt-get update" |