diff options
author | adv <adv@uma.es> | 2011-02-24 22:15:53 +0000 |
---|---|---|
committer | adv <adv@uma.es> | 2011-02-24 22:15:53 +0000 |
commit | 70848f4b6596e143fdb57b129ad99a17d459df19 (patch) | |
tree | a879204c9159dfa6f127eb990da9fe844ee3b2b7 | |
parent | 914d834897ea6bbdf9f8486e737c820c87ca69d5 (diff) |
branch version 1.0
git-svn-id: https://opengnsys.es/svn/branches/version1.0@1504 a21b9725-9963-47de-94b9-378ad31fedc9
-rwxr-xr-x | admin/Sources/Services/ogAdmRepoAux | 2 | ||||
-rwxr-xr-x | admin/WebConsole/gestores/gestor_pxe.php | 2 | ||||
-rwxr-xr-x | installer/opengnsys_installer.sh | 2 | ||||
-rwxr-xr-x | repoman/bin/sendFileMcast | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/admin/Sources/Services/ogAdmRepoAux b/admin/Sources/Services/ogAdmRepoAux index af13f093..a0c26baa 100755 --- a/admin/Sources/Services/ogAdmRepoAux +++ b/admin/Sources/Services/ogAdmRepoAux @@ -20,7 +20,7 @@ case $PARM1 in FILE=/opt/opengnsys/images$PARM2 MCASTOPT=$PARM3 #3 opciones protocolo multicast - echo "/opt/opengnsys/bin/SendFileMcast $FILE $MCASTOPT" + echo "/opt/opengnsys/bin/sendFileMcast $FILE $MCASTOPT" /opt/opengnsys/bin/sendFileMcast $FILE $MCASTOPT ;; esac
\ No newline at end of file diff --git a/admin/WebConsole/gestores/gestor_pxe.php b/admin/WebConsole/gestores/gestor_pxe.php index cbde8883..d4a9e4e3 100755 --- a/admin/WebConsole/gestores/gestor_pxe.php +++ b/admin/WebConsole/gestores/gestor_pxe.php @@ -125,7 +125,7 @@ while (!$rs->EOF) $netmask=netmask2cidr($netmask); } - $iseac=substr_count($rs->campos["append"] , "engine=testing"); + $iseac=substr_count($rs->campos["append"] , "boot=oginit"); $isinitrd=substr_count($rs->campos["append"] , "initrd.gz"); if ($iseac > 0) diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index cd6bd940..b4244243 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -43,7 +43,7 @@ INSTALL_TARGET=/opt/opengnsys LOG_FILE=/tmp/opengnsys_installation.log # Array con las dependencias -DEPENDENCIES=( subversion apache2 php5 libapache2-mod-php5 mysql-server php5-mysql nfs-kernel-server dhcp3-server udpcast bittorrent tftp-hpa tftpd-hpa syslinux openbsd-inetd update-inetd build-essential g++-multilib libmysqlclient15-dev wget doxygen graphviz bittornado ctorrent samba unzip netpipes debootstrap subversion schroot squashfs-tools ) +DEPENDENCIES=( subversion apache2 php5 libapache2-mod-php5 mysql-server php5-mysql nfs-kernel-server dhcp3-server bittorrent tftp-hpa tftpd-hpa syslinux openbsd-inetd update-inetd build-essential g++-multilib libmysqlclient15-dev wget doxygen graphviz bittornado ctorrent samba unzip netpipes debootstrap subversion schroot squashfs-tools ) # Base de datos OPENGNSYS_DB_CREATION_FILE=opengnsys/admin/Database/ogAdmBD.sql diff --git a/repoman/bin/sendFileMcast b/repoman/bin/sendFileMcast index 92237a50..4829d8db 100755 --- a/repoman/bin/sendFileMcast +++ b/repoman/bin/sendFileMcast @@ -61,5 +61,5 @@ CERROR="8x8/128" which mbuffer &> /dev/null && MBUFFER="--pipe 'mbuffer -m 20M'" ##### ADV v. 1.0 23/02/2011 #version 0.10 # udp-sender $MBUFFER --portbase $PORTBASE --$METHOD --mcast-data-address $ADDRESS --fec $CERROR --max-bitrate $BITRATE --ttl 1 --min-clients $NCLIENTS --max-wait $MAXTIME --file "$FICHIMG" -udp-sender $MBUFFER --nokbd --retries-until-drop 65 --portbase $PORTBASE --$METHOD --mcast-data-address $ADDRESS --fec $CERROR --max-bitrate $BITRATE --ttl 1 --min-clients $NCLIENTS --max-wait $MAXTIME --file "$FICHIMG" +/opt/opengnsys/bin/udp-sender $MBUFFER --nokbd --retries-until-drop 65 --portbase $PORTBASE --$METHOD --mcast-data-address $ADDRESS --fec $CERROR --max-bitrate $BITRATE --ttl 1 --min-clients $NCLIENTS --max-wait $MAXTIME --file "$FICHIMG" ##### ADV v. 1.0 23/02/2011 |