diff options
11 files changed, 35 insertions, 16 deletions
diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib index 9bffa351..00eb02d8 100755 --- a/client/boot-tools/boottoolsfunctions.lib +++ b/client/boot-tools/boottoolsfunctions.lib @@ -115,6 +115,20 @@ case "${1,,}" in OSARCH="amd64" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; + xenial-4.13) # ogLive 1.1.0-rc6 basado en Ubuntu 16.04 y Kernel 4.13. + OSDISTRIB="ubuntu" + OSCODENAME="xenial" + OSRELEASE="4.13.0-17-generic" + OSARCH="amd64" + OSHTTP="http://es.archive.ubuntu.com/ubuntu/" + ;; + artful) # ogLive 1.1.1-rc1 basado en Ubuntu 17.10 y Kernel 4.13. + OSDISTRIB="ubuntu" + OSCODENAME="artful" + OSRELEASE="4.13.0-37-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) @@ -128,7 +142,7 @@ case "${1,,}" in ;; esac SVNURL="https://opengnsys.es/svn/branches/version1.1/client" -VERSIONSVN=$(LANG=C svn info $SVNURL | awk '/Rev:/ {print "r"$4}') +VERSIONSVN=$(LC_ALL=C svn info $SVNURL | awk '/Rev:/ {print "r"$4}') NAMEISOCLIENT="$VERSIONBOOTTOOLS-$OSCODENAME-$OSRELEASE-$OSARCH-$VERSIONSVN" NAMEHOSTCLIENT="$VERSIONBOOTTOOLS-$OSCODENAME-$VERSIONSVN" export OSDISTRIB OSCODENAME OSRELEASE OSARCH OSHTTP @@ -350,7 +364,7 @@ TIMEMOD=`date +%Y%m%d-%H%M%S` #copiando cp /tmp/initrd.img-${OSRELEASE} ${BTTARGETDIR}/oginitrd.img -cp /tmp/vmlinuz-${OSRELEASE} ${BTTARGETDIR}/ogvmlinuz +cp /tmp/vmlinuz-${OSRELEASE}.efi.signed ${BTTARGETDIR}/ogvmlinuz #generamos md5 del kernel y del initrd. DATASUM=`md5sum "${BTTARGETDIR}/oginitrd.img" | cut -f1 -d" "` echo $DATASUM > ${BTTARGETDIR}/oginitrd.img.sum diff --git a/client/boot-tools/boottoolsgenerator.sh b/client/boot-tools/boottoolsgenerator.sh index 7bdba8d0..8983f0ee 100755 --- a/client/boot-tools/boottoolsgenerator.sh +++ b/client/boot-tools/boottoolsgenerator.sh @@ -46,7 +46,7 @@ echoAndLog "OpenGnsys CLIENT installation begins at $(date)" btogGetOsInfo $TYPECLIENT ########################################################################## echo "FASE 2 - Instalación de software adicional." -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 +#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" diff --git a/client/boot-tools/includes/etc/apt/sources.list.debian b/client/boot-tools/includes/etc/apt/sources.list.debian index 71252e17..31c10f50 100644 --- a/client/boot-tools/includes/etc/apt/sources.list.debian +++ b/client/boot-tools/includes/etc/apt/sources.list.debian @@ -4,5 +4,5 @@ deb http://security.debian.org/ OSCODENAME/updates main contrib non-free deb-src http://security.debian.org/ OSCODENAME/updates main contrib non-free # DRBL -deb http://free.nchc.org.tw/drbl-core drbl stable +#deb http://free.nchc.org.tw/drbl-core drbl stable diff --git a/client/boot-tools/includes/etc/apt/sources.list.ubuntu b/client/boot-tools/includes/etc/apt/sources.list.ubuntu index b2071d35..51b19a41 100644 --- a/client/boot-tools/includes/etc/apt/sources.list.ubuntu +++ b/client/boot-tools/includes/etc/apt/sources.list.ubuntu @@ -49,7 +49,7 @@ deb-src http://security.ubuntu.com/ubuntu OSCODENAME-security multiverse deb http://archive.ubuntu.com/ubuntu OSCODENAME main -deb http://free.nchc.org.tw/drbl-core drbl stable +#deb http://free.nchc.org.tw/drbl-core drbl stable deb http://free.nchc.org.tw/ubuntu OSCODENAME-security main restricted universe multiverse #deb http://ppa.launchpad.net/freenx-team/ubuntu/ OSCODENAME main #deb http://ppa.launchpad.net/randomaction/ppa/ubuntu OSCODENAME main diff --git a/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt b/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt index 7fd91a34..2878503d 100644 --- a/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt +++ b/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt @@ -1 +1 @@ -OpenGnsys Client 1.1.0-rc5 +OpenGnsys Client 1.1.1-rc1-efi diff --git a/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions b/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions index d46ab875..0ea1f720 100644 --- a/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions +++ b/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions @@ -123,7 +123,7 @@ ogExportVarEnvironment () OGPROTOCOL="${ogprotocol:-smb}" [ "$ogunit" != "" ] && OGUNIT="/$ogunit" # OPTIONS Para samba y local (a nfs no le afecta) - export OPTIONS=" -o user=opengnsys,pass=og" + export OPTIONS=" -o vers=1.0,sec=ntlm,user=opengnsys,pass=og" DEFOGLIVE="ogclient" export OGLIVEDIR="${oglivedir:-$DEFOGLIVE}" && echo "OGLIVEDIR=$OGLIVEDIR" >> $CFGINITRD case "$OGPROTOCOL" in diff --git a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsInitrdGenerate.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsInitrdGenerate.sh index 6269f60a..7d301895 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsInitrdGenerate.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsInitrdGenerate.sh @@ -2,14 +2,13 @@ OGCLIENTCFG=${OGCLIENTCFG:-/tmp/ogclient.cfg} [ -f $OGCLIENTCFG ] && source $OGCLIENTCFG -OSRELEASE=${OSRELEASE:-$(uname -a | awk '{print $3}')} - +OSRELEASE=${OSRELEASE:-$(uname -r)} rm -f /usr/lib/initramfs-tools/bin/* cp /bin/busybox ./ cd /tmp/ mkinitramfs -o /tmp/initrd.img-$OSRELEASE -v $OSRELEASE -cp /boot/vmlinuz-$OSRELEASE /tmp +cp -v /boot/vmlinuz-$OSRELEASE.efi.signed /tmp history -c diff --git a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh index 267b646b..de2ec722 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh @@ -50,8 +50,8 @@ if [ "$OSRELEASE" == "3.7.6-030706-generic" ]; then popd rm -fr /tmp/kernel else - # Instalar Kernel del repositorio de paquetes. - apt-get -y --force-yes install linux-image-${OSRELEASE} linux-headers-${OSRELEASE} dkms + # Instalar Kernel firmado del repositorio de paquetes. + apt-get -y --force-yes install linux-signed-image-${OSRELEASE} linux-headers-${OSRELEASE} dkms shim-signed apt-get -y --force-yes install linux-image-extra-${OSRELEASE} 2>/dev/null fi diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic index fc869c80..4b7e8217 100644 --- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic +++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic @@ -16,7 +16,7 @@ install python #install php5-cli # ogLive anterior a Ubuntu 16.04 install php-cli # ogLive a partir de Ubuntu 16.04 install dmidecode -install realpath +#install realpath # ogLive hasta Ubuntu 16.04 install rpm install sqlite3 install os-prober diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.cloning b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.cloning index ca47629a..0092bd29 100644 --- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.cloning +++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.cloning @@ -5,7 +5,7 @@ install pxe-kexec install mbuffer install parted install gdisk -install drbl-chntpw +install chntpw install clonezilla install registry-tools install reglookup diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing index 15aae730..13cd2665 100644 --- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing +++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing @@ -3,15 +3,21 @@ install screen install schroot #install grub install xmlstarlet +############# UEFI install efibootmgr -############# Requisitos para el cliente 1.1.0 en pruebas compatible con Remote-PC +install efitools +install refind +############# OGAgent install libxss1 install python-prctl install python-six install python-requests ############## +install fusioninventory-agent +install nvme-cli +install disktype +install laptop-detect #install discover -#install laptop-detect #install casper #install lupin-casper #install xinit |