#724: Herramientas boot-tools preparadas para generar clinete ogLive basado en Ubuntu 16.04 LTS.

git-svn-id: https://opengnsys.es/svn/branches/version1.1@4992 a21b9725-9963-47de-94b9-378ad31fedc9

client/boot-tools/boottoolsfunctions.lib

@@ -97,6 +97,13 @@ case "${1,,}" in
 		OSARCH="i386"
 		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
 		;;
+	xenial) 	# ogLive 1.1.0-rc4 basado en Ubuntu 16.04.
+		OSDISTRIB="ubuntu"
+		OSCODENAME="xenial"
+		OSRELEASE="4.4.0-34-generic"
+		OSARCH="i386"
+		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
+		;;
 	host | *)	# ogLive basado en la distribución del servidor.
 		OSDISTRIB=$(lsb_release -is)
 		OSCODENAME=$(lsb_release -cs)
@@ -380,16 +387,22 @@ btogGetVar
 #Preparamos los gestores de arranque
 mkdir -p /tmp/iso/isolinux
 cp -av /usr/lib/syslinux/* /tmp/iso/isolinux/
-cp -av /usr/share/gpxe/* /tmp/iso/isolinux/
+if [ -d /usr/share/gpxe ]; then
+    cp -av /usr/share/gpxe/* /tmp/iso/isolinux
+    PXE=gpxe
+elif [ -d /usr/lib/ipxe ]; then
+    cp -av /usr/lib/ipxe/* /tmp/iso/isolinux
+    PXE=ipxe
+fi
 
-# Si existe isolinux/gpxe.iso, montarlo para extraer isolinux.bin.
-if [ -f /tmp/iso/isolinux/gpxe.iso ]; then
+# Si existe el fichero ISO, montarlo para extraer isolinux.bin.
+if [ -f /tmp/iso/isolinux/$PXE.iso ]; then
     mkdir -p /tmp/iso/isolinux/mount
-    mount -o loop /tmp/iso/isolinux/gpxe.iso /tmp/iso/isolinux/mount
+    mount -o loop /tmp/iso/isolinux/$PXE.iso /tmp/iso/isolinux/mount
     cp -va /tmp/iso/isolinux/mount/* /tmp/iso/isolinux
     umount /tmp/iso/isolinux/mount
     rmdir /tmp/iso/isolinux/mount
-    rm -f /tmp/iso/isolinux/gpxe.iso
+    rm -f /tmp/iso/isolinux/$PXE.iso
 fi
 
 cat << FIN > /tmp/iso/isolinux/isolinux.cfg
@@ -427,22 +440,22 @@ append -
 
 label 5
 MENU LABEL Network boot via gPXE lkrn
-KERNEL gpxe.lkrn
+KERNEL $PXE.lkrn
 
 label 6
 MENU LABEL Network boot via gPXE usb
-KERNEL gpxe.usb
+KERNEL $PXE.usb
 
 label 7
 MENU LABEL Network boot via gPXE  pxe
-KERNEL gpxe.pxe
+KERNEL $PXE.pxe
 
 label 8
 MENU LABEL Network boot via gPXE  iso
-KERNEL gpxe.iso
+KERNEL $PXE.iso
 
 label 9
-MENU LABEL gpxe
+MENU LABEL pxe
 KERNEL /clonezilla/live/vmlinuz1
 APPEND initrd=/clonezilla/live/initrd1.img boot=live union=aufs noswap vga=788 ip=frommedia
 FIN

client/boot-tools/boottoolsgenerator.sh

@@ -46,8 +46,11 @@ echoAndLog "OpenGnsys CLIENT installation begins at $(date)"
 btogGetOsInfo $TYPECLIENT
 ##########################################################################
 echo "FASE 2 - Instalación de software adicional."
-cat /etc/apt/sources.list | grep "http://free.nchc.org.tw/drbl-core" || echo "deb http://free.nchc.org.tw/drbl-core drbl stable " >> /etc/apt/sources.list
-apt-get update; apt-get -y --force-yes install debootstrap subversion schroot squashfs-tools syslinux genisoimage gpxe qemu lsof
+grep "http://free.nchc.org.tw/drbl-core" /etc/apt/sources.list || echo "deb http://free.nchc.org.tw/drbl-core drbl stable" >> /etc/apt/sources.list
+apt-get update
+[ -n "$(apt-cache search gpxe)" ] && PXEPKG="gpxe"
+[ -n "$(apt-cache search ipxe)" ] && PXEPKG="ipxe"
+apt-get -y --force-yes install debootstrap subversion schroot squashfs-tools syslinux genisoimage $PXEPKG qemu lsof
 ###################################################################3
 echo "FASE 3 - Creación del Sistema raiz RootFS (Segundo Sistema archivos (img)) "
 echo "Fase 3.1 Generar y formatear el disco virtual. Generar el dispositivo loop."

client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt

@@ -1 +1 @@
-OpenGnsys Client 1.1.0-rc2
+OpenGnsys Client 1.1.0-rc4

client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions

@@ -510,7 +510,7 @@ then
 	fi
 # Realizamos la union entre el ogliveram(initrd) y el ogliverootfs(ogclient.sqfs)	
 # Nota: el orden es muy importante para evitar errores de montaje.
-	for i in bin sbin etc var lib usr root boot; do
+	for i in bin sbin lib etc var usr root boot; do
 		ogUnionLiveDir $i
 	done
 	cat /tmp/mtab.preunion > /etc/mtab

client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic

@@ -13,7 +13,8 @@ install gawk
 install subversion
 install python-openssl 
 install python 
-install php5-cli
+install php5-cli	# ogLive anterior a Ubuntu 16.04
+#install php-cli	# ogLive a partir de Ubuntu 16.04
 install dmidecode 
 install realpath
 install rpm

client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.cloning

@@ -1,5 +1,5 @@
 #sw.cloning
-install drbl-partimage 
+#install drbl-partimage		# Eliminado
 install fsarchiver 
 install pv 
 install pxe-kexec

client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.compresor

@@ -4,9 +4,9 @@ install zip
 install unzip 
 install gzip 
 install lzop 
-install drbl-lzop 
+#install drbl-lzop	# Eliminado
 install pigz 
 install pbzip2 
 install lbzip2 
 install rzip 
-install p7zip-full
+install p7zip-full

client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.filesystem.local

@@ -1,8 +1,9 @@
 #sw.filesystem.local
 install squashfs-tools
 install unionfs-fuse
-install drbl-ntfsprogs 
+#install drbl-ntfsprogs		# Eliminado
 install ntfs-3g 
+install ntfs-config
 install dosfstools 
 install fatresize
 install exfat-utils
@@ -21,9 +22,9 @@ install hfsprogs
 install hfsutils
 install nilfs-tools
 install vmfs-tools
-install zfsutils
-# Solo en ogLive anterior a Ubuntu 14.04
-#install ufsutils
+#install ufsutils		# ogLive anterior a Ubuntu 14.04
+install zfsutils		# ogLive anterior a Ubuntu 16.04
+#install zfsutils-linux		# ogLive a partir de Ubuntu 16.04
 # Solo en ogLive basado en Ubuntu 14.04 o posterior
 install android-tools-adb
 install android-tools-fastboot

installer/vagrant/Vagrantfile-boottools-vbox

@@ -21,6 +21,7 @@ dpkg-reconfigure -fnoninteractive console-setup
 apt-get update -y
 apt-get install -y subversion
 # Prepare environment.
+groupadd opengnsys
 mkdir -p /opt/opengnsys/client /tmp/opengnsys_installer/opengnsys
 ln -fs /var/lib/tftpboot /opt/opengnsys
 svn export http://opengnsys.es/svn/branches/version1.1/client /tmp/opengnsys_installer/opengnsys/client
@@ -38,13 +39,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       vb.name = "ogBootTools"
       vb.memory = VMMEM
       vb.cpus = 1
-      vb.gui = true
     end
     # VM base and host name.
     bt.vm.box = "ubuntu/wily32"
     bt.vm.hostname = "ogBootTools"
-    # Disable synced folder.
-    bt.vm.synced_folder ".", "/vagrant", disabled: true
+    # Comment out to disable synced folder.
+    #bt.vm.synced_folder ".", "/vagrant", disabled: true
     # Launch provisioning script.
     bt.vm.provision "shell", inline: SCRIPT
   end