#997: Changes to build an ogLive client based on Ubuntu 20.04

boottoolsfunctions.lib

@@ -137,6 +137,13 @@ case "${1,,}" in
 		OSARCH="amd64"
 		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
 		;;
+	focal) 	# ogLive 1.2.0-rc1 basado en Ubuntu 20.04 y Kernel 5.4.
+		OSDISTRIB="ubuntu"
+		OSCODENAME="focal"
+		OSRELEASE="5.4.0-42-generic"
+		OSARCH="amd64"
+		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
+		;;
 	host)	# ogLive basado en la distribución del servidor.
 		OSDISTRIB=$(lsb_release -is)
 		OSCODENAME=$(lsb_release -cs)

boottoolsgenerator.sh

@@ -10,9 +10,9 @@
 #@date    2011/08/03
 #*/
 
- #mkdir -p /tmp/opengnsys_installer/opengnsys
- #svn export https://opengnsys.es/svn/branches/version1.1/client /tmp/opengnsys_installer/opengnsys
 
+BRANCH="branches/master"
+svn export --force https://github.com/opengnsys/OpenGnsys/$BRANCH/client /tmp/opengnsys_installer/opengnsys/client || exit 1
 
 #Variables
 TYPECLIENT="${1:-host}"
@@ -50,7 +50,7 @@ echo "FASE 2 - Instalación de software adicional."
 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
+apt-get -y install debootstrap subversion schroot squashfs-tools syslinux genisoimage $PXEPKG qemu qemu-utils 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."
@@ -77,7 +77,7 @@ chmod +x /tmp/boot-tools/*.sh
 # Incluir revisión.
 sed -i "1 s/$/ $GITRELEASE ($OSRELEASE)/" ${BTDIR}/includes/etc/initramfs-tools/scripts/VERSION.txt
 # En Ubuntu 13.04+ es necesario matar proceso de "udev" antes de desmontar.
-umount $BTROOTFSMNT 2>/dev/null || (kill -9 $(lsof -t $BTROOTFSMNT); umount $BTROOTFSMNT 2>/dev/null)
+umount $BTROOTFSMNT 2>/dev/null || (kill -9 $(lsof -t $BTROOTFSMNT); umount $BTROOTFSMNT) 2>/dev/null
 schroot -p -c IMGogclient -- /tmp/boot-tools/boottoolsFsOpengnsys.sh 
 ############################################################################################
 echo "FASE 6 - Instalar software"

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

@@ -1 +1 @@
-OpenGnsys Client 1.1.1-rc5
+OpenGnsys Client 1.2.0-rc1

includes/usr/bin/boot-tools/boottoolsFsLocales.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 cat << EOT | debconf-set-selections --
-console-data console-data/keymap/full select es
-console-data console-data/keymap/policy select Select keymap from full list
 console-setup console-setup/charmap47 select UTF-8
 console-setup console-setup/codeset47 select . Combined - Latin; Slavic Cyrillic; Greek
 console-setup console-setup/fontface47 select VGA
 console-setup console-setup/fontsize-fb47 select 8x16
-console-setup console-setup/fontsize-text47 select 8x16
 EOT
-dpkg-reconfigure console-data console-setup locales
+dpkg-reconfigure console-setup locales
 
 history -c

includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh

@@ -8,7 +8,7 @@ export LANG=C
 
 #ADV
 #Desactivamos upstart
-dpkg-divert --local --rename --add /sbin/initctl 
+dpkg-divert --local --rename --add /sbin/initctl
 ln -s /bin/true /sbin/initctl
 #TEST desactivamos upstart
 #apt-get update; apt-get install --no-install-recommends dbus; dbus-uuidgen > /var/lib/dbus/machine-id; dpkg-divert --local --rename --add /sbin/initctl; ln -s /bin/true /sbin/initctl
@@ -36,20 +36,16 @@ OGCLIENTCFG=${OGCLIENTCFG:-/tmp/ogclient.cfg}
 [ -f $OGCLIENTCFG ] && source $OGCLIENTCFG
 OSRELEASE=${OSRELEASE:-$(uname -r)}
 # Instalar Kernel firmado del repositorio de paquetes.
-apt-get -y --force-yes install linux-image-${OSRELEASE} linux-headers-${OSRELEASE} dkms shim-signed
+apt-get -y install linux-image-${OSRELEASE} linux-headers-${OSRELEASE} dkms shim-signed
-apt-get -y --force-yes install linux-modules-${OSRELEASE} linux-modules-extra-${OSRELEASE} 2>/dev/null
+apt-get -y install linux-modules-${OSRELEASE} linux-modules-extra-${OSRELEASE} 2>/dev/null
 
 # Valores para paquetes interactivos.
 cat << EOT | debconf-set-selections --
-console-data console-data/keymap/full select es
-console-data console-data/keymap/policy select Select keymap from full list
-davfs2 davfs2/suid_file boolean false
 kexec-tools kexec-tools/load_kexec boolean true
 openssh-server openssh-server/permit-root-login boolean true
 refind refind/install_to_esp boolean false
 EOT
-apt-get -y install sshfs console-data kexec-tools $PKGS32
+apt-get -y install sshfs kexec-tools $PKGS32
-#apt-get -y install davfs2
 
 #comenzamos con la instalación de los paquetes a instalar.
 for group in `find /usr/bin/boot-tools/listpackages/ -name sw.*`
@@ -58,7 +54,7 @@ do
 	for package in ` awk /^install/'{print $2}' $group `
 	do
 		echo -n $package
-		apt-get -y --force-yes  install $package &>/dev/null 
+		apt-get -y install $package &>/dev/null
 		RETVAL=$?
 		if [ $RETVAL == 0 ]
 		then
@@ -86,7 +82,7 @@ while read -e mod vers; do
 	fi
 done < <(dkms status 2>/dev/null | awk -F, '$3~/added/ {print $1,$2}')
 
-#Activamos el hook del oginitrd.img 
+#Activamos el hook del oginitrd.img
 mv /etc/initramfs-tools/oghooks /etc/initramfs-tools/hooks/
 
 # Dejamos el mtab como al principio
@@ -97,7 +93,7 @@ echo "   " > /etc/mtab
 #TEST
 #apt-get install localepurge
 #localepurge
-#rm /var/lib/dbus/machine-id; rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl; 
+#rm /var/lib/dbus/machine-id; rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl;
 #FIN ADV
 
 apt-get clean

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

@@ -5,7 +5,7 @@ install fbset
 install gdebi-core
 install bash-static
 install busybox-static
-install console-data
+#install console-data	# ogLive anterior a Ubuntu 20.04
 install locales
 install lshw 
 install gawk 

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

@@ -3,7 +3,7 @@ install squashfs-tools
 install unionfs-fuse
 #install drbl-ntfsprogs		# Eliminado
 install ntfs-3g 
-install ntfs-config
+#install ntfs-config		# ogLive anterior a Ubuntu 20.04
 install dosfstools 
 install fatresize
 install exfat-utils
@@ -11,7 +11,8 @@ install dmraid
 install dmsetup 
 install lvm2 
 install e2fsprogs
-install btrfs-tools
+#install btrfs-tools		# ogLive anterior a Ubuntu 20.04
+install btrfs-progs		# ogLive a partir de Ubuntu 20.04
 install jfsutils 
 install reiserfsprogs
 install reiser4progs
@@ -25,8 +26,7 @@ install vmfs-tools
 #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	# ogLive a partir de Ubuntu 16.04
-install android-tools-adb
+install android-tools-fastboot	# ogLive a partir de Ubuntu 16.04
-install android-tools-fastboot
+#install android-tools-fsutils	# ogLive entre Ubuntu 16.04 y Ubuntu 20.04
-install android-tools-fsutils
 install f2fs-tools

includes/usr/bin/boot-tools/listpackages/sw.filesystem.remote

@@ -5,4 +5,4 @@ install cifs-utils
 install smbclient 
 install open-iscsi 
 install openssh-server 
-install bittornado 
+#install bittornado 	# ogLive anterior a Ubuntu 20.04

includes/usr/bin/boot-tools/listpackages/sw.testing

@@ -10,10 +10,10 @@ install grub-efi-amd64-bin
 install grub-efi-ia32-bin
 install grub-pc-bin
 ############# OGAgent
-install libxss1
+#install libxss1
-install python-prctl
+#install python-prctl
-install python-six
+#install python-six
-install python-requests
+#install python-requests
 ##############
 install fusioninventory-agent
 install nvme-cli