diff options
Diffstat (limited to 'client')
10 files changed, 27 insertions, 53 deletions
diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib index 7f7bbb38..da9cca2c 100755 --- a/client/boot-tools/boottoolsfunctions.lib +++ b/client/boot-tools/boottoolsfunctions.lib @@ -126,7 +126,14 @@ case "${1,,}" in bionic-4.18) # ogLive 1.1.1-rc3 basado en Ubuntu 18.04 y Kernel 4.18. OSDISTRIB="ubuntu" OSCODENAME="bionic" - OSRELEASE="4.18.0-17-generic" + OSRELEASE="4.18.0-20-generic" + OSARCH="amd64" + OSHTTP="http://es.archive.ubuntu.com/ubuntu/" + ;; + bionic-5.0) # ogLive 1.1.1-rc4 basado en Ubuntu 18.04 y Kernel 5.0. + OSDISTRIB="ubuntu" + OSCODENAME="bionic" + OSRELEASE="5.0.0-15-generic" OSARCH="amd64" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; diff --git a/client/boot-tools/includes/etc/initramfs-tools/modules b/client/boot-tools/includes/etc/initramfs-tools/modules index 8300452a..78a25980 100644 --- a/client/boot-tools/includes/etc/initramfs-tools/modules +++ b/client/boot-tools/includes/etc/initramfs-tools/modules @@ -17,10 +17,12 @@ # Kernel 3.7+ video. uvesafb -#generales -usbcore -uhci_hcd -ehci_hcd +# Generales +#usbcore +#uhci_hcd +#ehci_hcd usbhid usbmouse mac-hid +arc4 +cmac 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 bc92b96f..2c8efadf 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.1-rc3 +OpenGnsys Client 1.1.1-rc4 diff --git a/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions b/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions index 62f0524a..4d96f7eb 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 vers=1.0,sec=ntlm,user=opengnsys,pass=og" + export OPTIONS=" -o 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/boottoolsSoftwareCompile.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh index 9a9fb764..6c27f300 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh @@ -13,32 +13,12 @@ export LANG=C source /opt/opengnsys/lib/engine/bin/ToolsGNU.c &>/dev/null pushd /tmp -echo "ms-sys " -which ms-sys || ms-sys install &>/dev/null +echo "ms-sys" +which ms-sys || (wget https://sourceforge.net/projects/ms-sys/files/latest/download -O ms-sys.tar.gz; tar xpvzf ms-sys.tar.gz; cd $(tar tzf ms-sys.tar.gz|head -1); make install; cd ..) echo "spartlnx" which spartlnx.run || $(wget http://damien.guibouret.free.fr/savepart.zip &>/dev/null; unzip -o savepart.zip -d /sbin/) -# Mach-O loader for Linux -#echo "maloader" -#apt-get install -y uuid-dev lib64z1 lib32z1 -#wget https://github.com/shinh/maloader/archive/master.zip -#unzip master.zip -#cd maloader-master -#perl -pi -le 'print "#include <unistd.h>" if $. == 45' ld-mac.cc -#if [ "$(arch)" == "x86_64" ]; then -# ln -fs /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 /lib/libcrypto.so 2>/dev/null -# make release -#else -# ln -fs /lib/i386-linux-gnu/libcrypto.so.1.0.0 /lib/libcrypto.so 2>/dev/null -# make clean -# make all BITS=32 -#fi -#cp -va ld-mac /usr/bin -#cp -va libmac.so /usr/lib -#cd .. -#rm -fr master.zip maloader-master - popd export LANGUAGE=$OLDLANGUAGE export LC_ALL=$OLDLC_ALL 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 95a64cf9..301cd991 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh @@ -35,25 +35,9 @@ echo "/dev/sda1 / ext4 rw,errors=remount-ro 0 0" > /etc/mtab OGCLIENTCFG=${OGCLIENTCFG:-/tmp/ogclient.cfg} [ -f $OGCLIENTCFG ] && source $OGCLIENTCFG OSRELEASE=${OSRELEASE:-$(uname -r)} -# inicio de la instalacion -if [ "$OSRELEASE" == "3.7.6-030706-generic" ]; then - # Descargar e instalar Kernel 3.7. - mkdir -p /tmp/kernel - pushd /tmp/kernel - apt-get -y --force-yes install wget crda libnl-3-200 libnl-genl-3-200 wireless-regdb - wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.6-raring/linux-image-3.7.6-030706-generic_3.7.6-030706.201302040006_$OSARCH.deb - wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.6-raring/linux-image-extra-3.7.6-030706-generic_3.7.6-030706.201302040006_$OSARCH.deb - wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.6-raring/linux-headers-3.7.6-030706-generic_3.7.6-030706.201302040006_$OSARCH.deb - wget http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.7.6-raring/linux-headers-3.7.6-030706_3.7.6-030706.201302040006_all.deb - dpkg -i *.deb - apt-get -y --force-yes install dkms - popd - rm -fr /tmp/kernel -else - # 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 --force-yes install linux-modules-${OSRELEASE} linux-modules-extra-${OSRELEASE} 2>/dev/null -fi +# 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 --force-yes install linux-modules-${OSRELEASE} linux-modules-extra-${OSRELEASE} 2>/dev/null # Valores para paquetes interactivos. cat << EOT | debconf-set-selections -- @@ -64,7 +48,8 @@ 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 davfs2 $PKGS32 +apt-get -y install sshfs console-data 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.*` 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 31f2b559..73e1c2b9 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 @@ -4,7 +4,7 @@ install man-db install fbset install gdebi-core install bash-static -install busybox-static +install busybox-static install console-data install locales install lshw 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 0092bd29..3e6a7666 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 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 13cd2665..eca18286 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 @@ -16,7 +16,7 @@ install python-requests install fusioninventory-agent install nvme-cli install disktype -install laptop-detect +install laptop-detect #install discover #install casper #install lupin-casper diff --git a/client/shared/etc/preinit/fileslinks.sh b/client/shared/etc/preinit/fileslinks.sh index b6fc7e2f..442c2920 100755 --- a/client/shared/etc/preinit/fileslinks.sh +++ b/client/shared/etc/preinit/fileslinks.sh @@ -32,7 +32,7 @@ if [ -n "$OPENGNSYS" ]; then # Enlaces para Qt Embeded. QTDIR="/usr/local" mkdir -p $QTDIR/{etc,lib,plugins} - for i in $OGLIB/qtlib/*; do + for i in $OGLIB/qtlib/* $OGLIB/fonts; do [ -f $QTDIR/lib/$i ] || ln -fs $i $QTDIR/lib 2>/dev/null done for i in $OGLIB/qtplugins/*; do |