Integrar OpenGnSys 1.0.1 en rama principal (modifica #413).

git-svn-id: https://opengnsys.es/svn/trunk@2065 a21b9725-9963-47de-94b9-378ad31fedc9

13 files changed, 296 insertions, 0 deletions

diff --git a/server/tftpboot/NetbootPXE.es.txt b/server/tftpboot/NetbootPXE.es.txt
new file mode 100644
index 00000000..e467b763
--- /dev/null
+++ b/server/tftpboot/NetbootPXE.es.txt
@@ -0,0 +1,39 @@
+Como cambiar el arranque en red PXELinux por Grub4DOS
+=====================================================
+
+
+OpenGnSys usa como gestor PXE el binario pxelinux.0
+
+
+También ofrece la posibilidad de usar el bianrio grldr que se está evaluando para solucionar algunas incidencias.
+
+
+
+Activar el grldr del grub4dos
+1) modificar el dhcp, donde aparezca filename "pxelinux.0" por "grldr"
+     filename "grldr";
+2) Reiniciamos el servicio dhcp    
+     /etc/init.d/dhcpd restart
+3) Renombrar cambiar el gestor de arranque de la web, para que use grldr.
+    cp /opt/opengnsys/www/principal/boot.php /opt/opengnsys/www/principal/boot.pxelinux.php
+	cp /opt/opengnsys/www/principal/boot.grub4dos.php /opt/opengnsys/www/principal/boot.php
+    
+4) En la funcion ogBoot, de la libreria Boot.lib descomentar los comentarios del if de las líneas 71 a 85, para que quede 
+        #FIXME: activar seguimiento inicio sesion XP con grub4dos
+		if `ogGetOsVersion $1 $2 | grep "XP" > /dev/null`
+        then 
+        	dd if=/dev/zero of=${MNTDIR}/ogboot.me  bs=1024 count=3
+        	dd if=/dev/zero of=${MNTDIR}/ogboot.firstboot  bs=1024 count=3
+        	dd if=/dev/zero of=${MNTDIR}/ogboot.secondboot  bs=1024 count=3         
+        	ogLoadHiveWindows $1 $2
+			ogHiveNTRunMachine "cmd /c del c:\ogboot.* "  ogcleanboot
+			ogUpdateHiveWindows
+			reboot
+        else        
+        	cp $OGLIB/grub4dos/* $MNTDIR    # */ (Comentario Doxygen)
+        	##kexec -l $MNTDIR/grub.exe --append=--config-file="find --set-root /$LOADER; chainloader /$LOADER; tpm --init"
+        	kexec -l $MNTDIR/grub.exe --append=--config-file="root (hd$[$1-1],$[$2-1]); chainloader (hd$[$1-1],$[$2-1])/$LOADER; tpm --init"
+		fi
+
+
+ 
diff --git a/server/tftpboot/grldr b/server/tftpboot/grldr
new file mode 100644
index 00000000..16ed4c77
--- /dev/null
+++ b/server/tftpboot/grldr
diff --git a/server/tftpboot/menu.lst/default b/server/tftpboot/menu.lst/default
new file mode 100644
index 00000000..9fa2316b
--- /dev/null
+++ b/server/tftpboot/menu.lst/default
@@ -0,0 +1,8 @@
+timeout 1
+title  MBR
+keeppxe
+chainloader (hd0)+1
+rootnoverify (hd0) 
+boot
+
+
diff --git a/server/tftpboot/menu.lst/examples/default b/server/tftpboot/menu.lst/examples/default
new file mode 100644
index 00000000..278da613
--- /dev/null
+++ b/server/tftpboot/menu.lst/examples/default
@@ -0,0 +1,25 @@
+color white/blue black/light-gray
+timeout 330
+default /default
+
+title OGnet (network)
+kernel (pd)/ogclient/linux
+initrd (pd)/ogclient/initrd.gz
+boot
+
+title OGcache
+find --set-root /linuz
+kernel /linuz ip=dhcp ro boot=og vga=788 irqpoll acpi=on engine=testing reposerver=172.17.36.15
+initrd /initrd.img 
+boot
+
+title OGiso
+map --mem (pd)/ogclient.iso (0xFF)
+map --hook
+root (0xFF)
+chainloader (0xFF)
+boot
+
+title PXELinux
+pxe keep
+chainloader --raw (pd)/pxelinux.0
\ No newline at end of file
diff --git a/server/tftpboot/menu.lst/examples/defaultHOTREBOOT_WindowsXP b/server/tftpboot/menu.lst/examples/defaultHOTREBOOT_WindowsXP
new file mode 100644
index 00000000..70c9061a
--- /dev/null
+++ b/server/tftpboot/menu.lst/examples/defaultHOTREBOOT_WindowsXP
@@ -0,0 +1,36 @@
+default saved
+timeout 1
+hiddenmenu
+fallback 1 2 3
+
+title firsboot
+find --set-root --ignore-floppies /ogboot.me
+cmp /ogboot.me /ogboot.firstboot || ls FALLBACK
+write /ogboot.firstboot iniciado
+chainloader /ntldr
+savedefault fallback
+boot
+
+title secondboot
+find --set-root --ignore-floppies /ogboot.me
+cmp /ogboot.me /ogboot.secondboot || ls FALLBACK
+write /ogboot.secondboot iniciado
+chainloader /ntldr
+savedefault fallback
+boot
+
+title OpenGnsys-CACHE
+find --set-root /boot/ogvmlinuz
+kernel /boot/ogvmlinuz ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true  IP=dhcp repo=172.17.9.249
+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  IP=dhcp repo=172.17.9.249
+initrd (pd)/ogclient/oginitrd.img
+savedefault
+boot
+
+
diff --git a/server/tftpboot/menu.lst/templates/1 b/server/tftpboot/menu.lst/templates/1
new file mode 100644
index 00000000..9fa2316b
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/1
@@ -0,0 +1,8 @@
+timeout 1
+title  MBR
+keeppxe
+chainloader (hd0)+1
+rootnoverify (hd0) 
+boot
+
+
diff --git a/server/tftpboot/menu.lst/templates/11 b/server/tftpboot/menu.lst/templates/11
new file mode 100644
index 00000000..00560c00
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/11
@@ -0,0 +1,8 @@
+timeout 1
+title FirstHardDisk-FirstPartition
+keeppxe
+root (hd0,0)
+chainloader (hd0,0)+1
+boot
+
+
diff --git a/server/tftpboot/menu.lst/templates/12 b/server/tftpboot/menu.lst/templates/12
new file mode 100644
index 00000000..2fb0dfcb
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/12
@@ -0,0 +1,6 @@
+timeout 1
+title FirstHardDisk-SecondPartition
+keeppxe
+root (hd0,1)
+chainloader (hd0,1)+1
+boot
diff --git a/server/tftpboot/menu.lst/templates/pxe b/server/tftpboot/menu.lst/templates/pxe
new file mode 100644
index 00000000..c7ef01fb
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/pxe
@@ -0,0 +1,38 @@
+default saved
+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=false ogdebug=false 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=false ogdebug=false INFOHOST 
+initrd (pd)/ogclient/oginitrd.img
+boot
+
+
+
+
+
diff --git a/server/tftpboot/menu.lst/templates/pxeADMIN b/server/tftpboot/menu.lst/templates/pxeADMIN
new file mode 100644
index 00000000..0dd603ce
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/pxeADMIN
@@ -0,0 +1,38 @@
+default saved
+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 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 
+initrd (pd)/ogclient/oginitrd.img
+boot
+
+
+
+
+
diff --git a/server/tftpboot/pxelinux.0 b/server/tftpboot/pxelinux.0
deleted file mode 100644
index 08270f1a..00000000
--- a/server/tftpboot/pxelinux.0
+++ /dev/null
diff --git a/server/tftpboot/pxelinux.cfg/examples/callGRUBfromPXELINUX b/server/tftpboot/pxelinux.cfg/examples/callGRUBfromPXELINUX
new file mode 100644
index 00000000..e40294f9
--- /dev/null
+++ b/server/tftpboot/pxelinux.cfg/examples/callGRUBfromPXELINUX
@@ -0,0 +1,61 @@
+DEFAULT syslinux/vesamenu.c32 
+PROMPT 0
+ 
+MENU TITLE Aplicacion OpenGnsys 
+MENU BACKGROUND opengnsys.png
+
+       
+
+
+LABEL title Boot MBR of First Hard Disk
+MENU LABEL title Boot MBR of First Hard Disk
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect; default 0; timeout 0; hiddenmenu; title  MBR; chainloader (hd0)+1; rootnoverify (hd0); boot;" 
+
+
+title Boot Partition Boot Sector - First Hard Disk, First Partition
+LABEL title Boot Partition Boot Sector - First Hard Disk, First Partition
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect; default 0; timeout 0; hiddenmenu; title  PBS11; root (hd0,0); chainloader (hd0,0)+1; boot;"
+
+title Boot Partition Boot Sector - First Hard Disk, Second Partition
+LABEL title Boot Partition Boot Sector - First Hard Disk, Second Partition
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect; default 0; timeout 0; hiddenmenu; title  PBS11; root (hd0,1); chainloader (hd0,1)+1; boot;"
+
+
+LABEL WindowsXP
+MENU LABEL WindowsXP
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect; default 0; timeout 0; hiddenmenu; title windowsXP; fallback 1; find --set-root --ignore-floppies /ntldr; chainloader /ntldr; boot; title net; kernel (pd)/ogclient/ogvmlinuz  ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false  IP=172.17.9.204:172.17.9.249:172.17.9.254:255.255.255.0:cte204:eth0:none repo=172.17.9.249; initrd (pd)/ogclient/oginitrd.img; boot"
+
+LABEL ogClientUser 
+MENU LABEL ogClientUser 
+KERNEL ogclient/ogvmlinuz 
+APPEND initrd=ogclient/oginitrd.img ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true  IP=172.17.9.204:172.17.9.249:172.17.9.254:255.255.255.0:cte204:eth0:none repo=172.17.9.249 
+
+
+
+
+LABEL DetectaWindowsXP
+MENU LABEL detectaWindowsXP
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect; default 0; timeout 0; hiddenmenu; title windowsXP; fallback 1; find --set-root --ignore-floppies /ogboot.me; chainloader /ntldr; boot; title net; kernel (pd)/ogclient/ogvmlinuz  ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true  IP=172.17.9.204:172.17.9.249:172.17.9.254:255.255.255.0:cte204:eth0:none repo=172.17.9.249; initrd (pd)/ogclient/oginitrd.img; boot"
+
+
+LABEL DetectaWindowsXP2
+MENU LABEL detectaWindowsXP2
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect; default saved; timeout 10; fallback 1 2;  title firsboot; find --set-root --ignore-floppies /ogboot.me; cmp /ogboot.me /ogfirstboot.me || ls FALLBACK; write /ogfirstboot.me iniciado ; chainloader /ntldr; savedefault fallback; boot; title secondboot; find --set-root --ignore-floppies /ogboot.me; cmp /ogboot.me /ogsecondboot.me || ls FALLBACK; write /ogsecondboot.me iniciado ; chainloader /ntldr; savedefault fallback; boot;  title OpenGnsys-NET; kernel (pd)/ogclient/ogvmlinuz  ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true  IP=172.17.9.204:172.17.9.249:172.17.9.254:255.255.255.0:cte204:eth0:none repo=172.17.9.249; initrd (pd)/ogclient/oginitrd.img; savedault; boot"
+
+
+
+LABEL IfNOTcacheGOnet
+MENU LABEL IfNOTcacheGOnet
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect; default 0; timeout 0; hiddenmenu; title cache; fallback 1; find --set-root /ogvmlinuz; kernel /ogvmlinuz ip=dhcp ro boot=oginit vga=788 irqpoll acpi=on engine=testing ogrepo=172.17.36.11 ogprotocol=smb og2nd=sqfs; initrd /oginitrd; boot; title net; kernel (pd)/ogclient/vmlinuz-2.6.32-21-generic-pae ip=dhcp ro boot=oginit vga=788 irqpoll acpi=on engine=testing ogrepo=172.17.36.11 ogprotocol=nfs og2nd=sqfs; initrd (pd)/ogclient/initrd.img-2.6.32-21-generic-pae; boot"
+
+LABEL grub command line
+MENU LABEL command line
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect;"
diff --git a/server/tftpboot/pxelinux.cfg/examples/examplecallGrub b/server/tftpboot/pxelinux.cfg/examples/examplecallGrub
new file mode 100644
index 00000000..2e888f98
--- /dev/null
+++ b/server/tftpboot/pxelinux.cfg/examples/examplecallGrub
@@ -0,0 +1,29 @@
+DEFAULT IfNOTcacheGOnet
+#DEFAULT pxe-2.6.32-21-generic-pae
+
+#ejemplos para el parametro ip
+#ip=ipCLIENTE:ipROOTserver:ipROUTER:NetMASK:hostNAME:[device]
+#ip=172.17.36.2:172.17.36.11:172.17.36.254:255.255.255.0:r60
+#ip=dhcp
+
+LABEL cache
+KERNEL grub.exe
+APPEND --config-file="find --set-root /vmlinuz; kernel /vmlinuz ip=dhcp ro boot=oginit vga=788 irqpoll acpi=on engine=testing reposerver=172.17.32.242; initrd /initrd.img"
+
+LABEL net
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect; kernel (pd)/ogclient/vmlinuz-2.6.32-21-generic-pae ip=dhcp ro boot=oginit vga=788 irqpoll acpi=on engine=testing ogrepo=172.17.32.242; initrd (pd)/ogclient/initrd.img-2.6.32-21-generic-pae"
+
+LABEL IfNOTcacheGOnet
+KERNEL grub.exe
+APPEND keeppxe --config-file="pxe detect; default 0; timeout 0; hiddenmenu; title cache; fallback 1; find --set-root /ogvmlinuz; kernel /ogvmlinuz ip=dhcp ro boot=oginit vga=788 irqpoll acpi=on engine=testing ogrepo=172.17.36.11 ogprotocol=smb og2nd=sqfs; initrd /oginitrd; boot; title net; kernel (pd)/ogclient/vmlinuz-2.6.32-21-generic-pae ip=dhcp ro boot=oginit vga=788 irqpoll acpi=on engine=testing ogrepo=172.17.36.11 ogprotocol=nfs og2nd=sqfs; initrd (pd)/ogclient/initrd.img-2.6.32-21-generic-pae; boot"
+
+
+
+LABEL pxe-2.6.32-21-generic-pae
+KERNEL ogclient/vmlinuz-2.6.32-21-generic-pae
+APPEND initrd=ogclient/initrd.img-2.6.32-21-generic-pae ip=dhcp ro boot=og vga=788 irqpoll acpi=on reposerver=172.17.32.242
+
+LABEL grub
+KERNEL grub.exe
+APPEND keeppxe
\ No newline at end of file