summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/Database/ogAdmBD-1.0.1-1.0.5pre.sql2
-rw-r--r--admin/Database/ogAdmBD-1.0.2-1.0.5pre.sql2
-rw-r--r--admin/Database/ogAdmBD-1.0.2a-1.0.5pre.sql2
-rw-r--r--admin/Database/ogAdmBD-1.0.3-1.0.5pre.sql2
-rw-r--r--admin/Database/ogAdmBD-1.0.4-1.0.5pre.sql2
-rw-r--r--admin/Database/ogAdmBD-1.0.4a-1.0.5pre.sql2
-rw-r--r--admin/Database/ogAdmBD-1.0.5pre.sql2
-rw-r--r--admin/Database/ogAdmBD.sql2
-rw-r--r--admin/WebConsole/barramenu.php5
-rwxr-xr-xinstaller/opengnsys_update.sh2
-rw-r--r--server/tftpboot/menu.lst/templates/01 (renamed from server/tftpboot/menu.lst/templates/1)0
-rw-r--r--server/tftpboot/menu.lst/templates/19pxeADMIN (renamed from server/tftpboot/menu.lst/templates/pxeADMIN)0
12 files changed, 14 insertions, 9 deletions
diff --git a/admin/Database/ogAdmBD-1.0.1-1.0.5pre.sql b/admin/Database/ogAdmBD-1.0.1-1.0.5pre.sql
index ede29f8f..d8186b5d 100644
--- a/admin/Database/ogAdmBD-1.0.1-1.0.5pre.sql
+++ b/admin/Database/ogAdmBD-1.0.1-1.0.5pre.sql
@@ -133,7 +133,7 @@ DROP TABLE IF EXISTS menuboot;
DROP TABLE IF EXISTS itemboot;
DROP TABLE IF EXISTS menuboot_itemboot;
ALTER TABLE ordenadores
- MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '01';
+ MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '00unknown';
UPDATE ordenadores SET arranque = '01' WHERE arranque = '1';
UPDATE ordenadores SET arranque = '19pxeadmin' WHERE arranque = 'pxeADMIN';
diff --git a/admin/Database/ogAdmBD-1.0.2-1.0.5pre.sql b/admin/Database/ogAdmBD-1.0.2-1.0.5pre.sql
index 6c29c1ee..f4c73492 100644
--- a/admin/Database/ogAdmBD-1.0.2-1.0.5pre.sql
+++ b/admin/Database/ogAdmBD-1.0.2-1.0.5pre.sql
@@ -133,7 +133,7 @@ DROP TABLE IF EXISTS menuboot;
DROP TABLE IF EXISTS itemboot;
DROP TABLE IF EXISTS menuboot_itemboot;
ALTER TABLE ordenadores
- MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '01';
+ MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '00unknown';
UPDATE ordenadores SET arranque = '01' WHERE arranque = '1';
UPDATE ordenadores SET arranque = '19pxeadmin' WHERE arranque = 'pxeADMIN';
diff --git a/admin/Database/ogAdmBD-1.0.2a-1.0.5pre.sql b/admin/Database/ogAdmBD-1.0.2a-1.0.5pre.sql
index f464edb9..8dc4268b 100644
--- a/admin/Database/ogAdmBD-1.0.2a-1.0.5pre.sql
+++ b/admin/Database/ogAdmBD-1.0.2a-1.0.5pre.sql
@@ -71,7 +71,7 @@ DROP TABLE IF EXISTS menuboot;
DROP TABLE IF EXISTS itemboot;
DROP TABLE IF EXISTS menuboot_itemboot;
ALTER TABLE ordenadores
- MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '01';
+ MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '00unknown';
UPDATE ordenadores SET arranque = '01' WHERE arranque = '1';
UPDATE ordenadores SET arranque = '19pxeadmin' WHERE arranque = 'pxeADMIN';
diff --git a/admin/Database/ogAdmBD-1.0.3-1.0.5pre.sql b/admin/Database/ogAdmBD-1.0.3-1.0.5pre.sql
index 46d8d2b7..5c216d2e 100644
--- a/admin/Database/ogAdmBD-1.0.3-1.0.5pre.sql
+++ b/admin/Database/ogAdmBD-1.0.3-1.0.5pre.sql
@@ -128,7 +128,7 @@ DROP TABLE IF EXISTS menuboot;
DROP TABLE IF EXISTS itemboot;
DROP TABLE IF EXISTS menuboot_itemboot;
ALTER TABLE ordenadores
- MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '01';
+ MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '00unknown';
UPDATE ordenadores SET arranque = '01' WHERE arranque = '1';
UPDATE ordenadores SET arranque = '19pxeadmin' WHERE arranque = 'pxeADMIN';
diff --git a/admin/Database/ogAdmBD-1.0.4-1.0.5pre.sql b/admin/Database/ogAdmBD-1.0.4-1.0.5pre.sql
index b9547966..e15d7622 100644
--- a/admin/Database/ogAdmBD-1.0.4-1.0.5pre.sql
+++ b/admin/Database/ogAdmBD-1.0.4-1.0.5pre.sql
@@ -81,7 +81,7 @@ DROP TABLE IF EXISTS menuboot;
DROP TABLE IF EXISTS itemboot;
DROP TABLE IF EXISTS menuboot_itemboot;
ALTER TABLE ordenadores
- MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '01';
+ MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '00unknown';
UPDATE ordenadores SET arranque = '01' WHERE arranque = '1';
UPDATE ordenadores SET arranque = '19pxeadmin' WHERE arranque = 'pxeADMIN';
diff --git a/admin/Database/ogAdmBD-1.0.4a-1.0.5pre.sql b/admin/Database/ogAdmBD-1.0.4a-1.0.5pre.sql
index 89d04a15..1bc7fdc8 100644
--- a/admin/Database/ogAdmBD-1.0.4a-1.0.5pre.sql
+++ b/admin/Database/ogAdmBD-1.0.4a-1.0.5pre.sql
@@ -68,7 +68,7 @@ DROP TABLE IF EXISTS menuboot;
DROP TABLE IF EXISTS itemboot;
DROP TABLE IF EXISTS menuboot_itemboot;
ALTER TABLE ordenadores
- MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '01';
+ MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '00unknown';
UPDATE ordenadores SET arranque = '01' WHERE arranque = '1';
UPDATE ordenadores SET arranque = '19pxeadmin' WHERE arranque = 'pxeADMIN';
diff --git a/admin/Database/ogAdmBD-1.0.5pre.sql b/admin/Database/ogAdmBD-1.0.5pre.sql
index 6cf6fd0d..8e8f4862 100644
--- a/admin/Database/ogAdmBD-1.0.5pre.sql
+++ b/admin/Database/ogAdmBD-1.0.5pre.sql
@@ -105,7 +105,7 @@ DROP TABLE IF EXISTS menuboot;
DROP TABLE IF EXISTS itemboot;
DROP TABLE IF EXISTS menuboot_itemboot;
ALTER TABLE ordenadores
- MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '01';
+ MODIFY arranque VARCHAR(30) NOT NULL DEFAULT '00unknown';
UPDATE ordenadores SET arranque = '01' WHERE arranque = '1';
UPDATE ordenadores SET arranque = '19pxeadmin' WHERE arranque = 'pxeADMIN';
diff --git a/admin/Database/ogAdmBD.sql b/admin/Database/ogAdmBD.sql
index a6c234b7..25d7afc8 100644
--- a/admin/Database/ogAdmBD.sql
+++ b/admin/Database/ogAdmBD.sql
@@ -488,7 +488,7 @@ CREATE TABLE IF NOT EXISTS `ordenadores` (
`router` varchar(16) NOT NULL,
`mascara` varchar(16) NOT NULL,
`idproautoexec` int(11) NOT NULL,
- `arranque` VARCHAR( 30 ) NOT NULL DEFAULT '01',
+ `arranque` VARCHAR( 30 ) NOT NULL DEFAULT '00unknown',
`netiface` enum('eth0','eth1','eth2') DEFAULT 'eth0',
`netdriver` varchar( 30 ) NOT NULL DEFAULT 'generic',
`fotoord` varchar( 250 ) NOT NULL,
diff --git a/admin/WebConsole/barramenu.php b/admin/WebConsole/barramenu.php
index 1b999651..d6351503 100644
--- a/admin/WebConsole/barramenu.php
+++ b/admin/WebConsole/barramenu.php
@@ -174,6 +174,11 @@ if (!$cmd)
<SPAN class=menupral ><?echo $TbMsg[9] ?></SPAN></A>&nbsp;</TD>
<TD width=4 align=middle><IMG src="./images/iconos/separitem.gif"></TD>
+ <TD onclick=eleccion(this,11) onmouseout=desresaltar(this) onmouseover=resaltar(this) align=middle>&nbsp;
+ <A href="#" style="text-decoration: none"><IMG border=0 src="./images/iconos/tablas.gif">
+ <SPAN class=menupral ><?echo $TbMsg[15] ?></SPAN></A>&nbsp;</TD>
+ <TD width=4 align=middle><IMG src="./images/iconos/separitem.gif"></TD>
+
<?}?>
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index 6309931b..78df632e 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -498,7 +498,7 @@ function createDirs()
echoAndLog "${FUNCNAME}(): setting directory permissions"
chmod -R 775 $INSTALL_TARGET/{log/clients,images,tftpboot/pxelinux.cfg,tftpboot/menu.lst}
mkdir -p $INSTALL_TARGET/tftpboot/menu.lst/examples
- [ -f $INSTALL_TARGET/tftpboot/menu.lst/templates/00unknown ] || mv $INSTALL_TARGET/tftpboot/menu.lst/templates/* $INSTALL_TARGET/tftpboot/menu.lst/examples
+ ! [ -f $INSTALL_TARGET/tftpboot/menu.lst/templates/00unknown ] || mv $INSTALL_TARGET/tftpboot/menu.lst/templates/* $INSTALL_TARGET/tftpboot/menu.lst/examples
chown -R :$OPENGNSYS_CLIENTUSER $INSTALL_TARGET/{log/clients,images,tftpboot/pxelinux.cfg,tftpboot/menu.lst}
if [ $? -ne 0 ]; then
errorAndLog "${FUNCNAME}(): error while setting permissions"
diff --git a/server/tftpboot/menu.lst/templates/1 b/server/tftpboot/menu.lst/templates/01
index 1b52bb54..1b52bb54 100644
--- a/server/tftpboot/menu.lst/templates/1
+++ b/server/tftpboot/menu.lst/templates/01
diff --git a/server/tftpboot/menu.lst/templates/pxeADMIN b/server/tftpboot/menu.lst/templates/19pxeADMIN
index f9f3246f..f9f3246f 100644
--- a/server/tftpboot/menu.lst/templates/pxeADMIN
+++ b/server/tftpboot/menu.lst/templates/19pxeADMIN