summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinstaller/opengnsys_installer.sh8
-rwxr-xr-xinstaller/opengnsys_update.sh1
-rw-r--r--server/tftpboot/menu.lst/templates/pxeADMIN24
3 files changed, 9 insertions, 24 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index 259402b9..cd724e2d 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -1025,7 +1025,7 @@ function openGnsysCopyClientFiles()
function clientCreate()
{
local DOWNLOADURL="http://www.opengnsys.es/downloads"
- local FILENAME=ogclient-1.0.2-natty-32bit-beta01-rev2111.iso
+ local FILENAME=ogLive-natty-2.6.38-8-generic-pae-r2303.iso
local TARGETFILE=$INSTALL_TARGET/lib/$FILENAME
local TMPDIR=/tmp/${FILENAME%.iso}
@@ -1048,6 +1048,12 @@ function clientCreate()
find -L $INSTALL_TARGET/tftpboot -type f -exec chmod 644 {} \;
chown -R :$OPENGNSYS_CLIENT_USER $INSTALL_TARGET/tftpboot/ogclient
chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/tftpboot/{menu.lst,pxelinux.cfg}
+
+ # Ofrecer md5 del kernel y vmlinuz para ogupdateinitrd en cache
+ cp -prv $INSTALL_TARGET/tftpboot/ogclient/ogvmlinuz* $INSTALL_TARGET/tftpboot/
+ cp -prv $INSTALL_TARGET/tftpboot/ogclient/oginitrd.img* $INSTALL_TARGET/tftpboot/
+
+
echoAndLog "${FUNCNAME}(): Client generation success"
}
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index fa97882e..d81ba381 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -573,6 +573,7 @@ function updateClient()
chown -R :$OPENGNSYS_CLIENTUSER $INSTALL_TARGET/tftpboot/ogclient
chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/tftpboot/{menu.lst,pxelinux.cfg}
+ # Ofrecer md5 del kernel y vmlinuz para ogupdateinitrd en cache
cp -prv $INSTALL_TARGET/tftpboot/ogclient/ogvmlinuz* $INSTALL_TARGET/tftpboot/
cp -prv $INSTALL_TARGET/tftpboot/ogclient/oginitrd.img* $INSTALL_TARGET/tftpboot/
diff --git a/server/tftpboot/menu.lst/templates/pxeADMIN b/server/tftpboot/menu.lst/templates/pxeADMIN
index 2e9c4593..68b9ada1 100644
--- a/server/tftpboot/menu.lst/templates/pxeADMIN
+++ b/server/tftpboot/menu.lst/templates/pxeADMIN
@@ -3,32 +3,10 @@ timeout 1
hiddenmenu
fallback 1 2 3
-title firsboot
-find --set-root --ignore-floppies --ignore-cd /ogboot.me
-cmp /ogboot.me /ogboot.firstboot || ls FALLBACK
-write /ogboot.firstboot iniciado
-chainloader +1
-savedefault fallback
-boot
-
-title secondboot
-find --set-root --ignore-floppies --ignore-cd /ogboot.me
-cmp /ogboot.me /ogboot.secondboot || ls FALLBACK
-write /ogboot.secondboot iniciado
-chainloader +1
-savedefault fallback
-boot
-
-title OpenGnsys-CACHE
-find --set-root --ignore-floppies --ignore-cd /boot/ogvmlinuz
-kernel /boot/ogvmlinuz ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogupdateinitrd=true INFOHOST
-initrd /boot/oginitrd.img
-savedefault fallback
-boot
title OpenGnsys-NET
keeppxe
-kernel (pd)/ogclient/ogvmlinuz ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true INFOHOST
+kernel (pd)/ogclient/ogvmlinuz ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogupdateinitrd=true INFOHOST
initrd (pd)/ogclient/oginitrd.img
boot