diff options
Diffstat (limited to 'client/boot-tools')
13 files changed, 46 insertions, 74 deletions
diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib index 15478248..3ad38d15 100755 --- a/client/boot-tools/boottoolsfunctions.lib +++ b/client/boot-tools/boottoolsfunctions.lib @@ -116,13 +116,27 @@ case "${1,,}" in OSARCH="amd64" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; - bionic) # ogLive 1.1.1-rc1 basado en Ubuntu 18.04 y Kernel 4.15. + bionic|bionic-4.15) # ogLive 1.1.1-rc1 basado en Ubuntu 18.04 y Kernel 4.15. OSDISTRIB="ubuntu" OSCODENAME="bionic" OSRELEASE="4.15.0-32-generic" OSARCH="amd64" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; + 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-20-generic" + OSARCH="amd64" + OSHTTP="http://es.archive.ubuntu.com/ubuntu/" + ;; + bionic-5.0) # ogLive 1.1.1-rc5 basado en Ubuntu 18.04 y Kernel 5.0. + OSDISTRIB="ubuntu" + OSCODENAME="bionic" + OSRELEASE="5.0.0-27-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) @@ -137,7 +151,7 @@ case "${1,,}" in esac BRANCH="devel" GITURL="https://api.github.com/repos/opengnsys/OpenGnsys/commits?sha=$BRANCH&path=/client" -GITRELEASE=$(curl -s "$GITURL" | jq -r '"r" + (.[0].commit.committer.date | gsub("-"; "")[:8]) + "." + (.[0].sha[:7])') +GITRELEASE=$(curl -s "$GITURL" | jq -r '"r" + (.[0].commit.committer.date | split("-") | join("")[:8]) + "." + (.[0].sha[:7])') NAMEISOCLIENT="$VERSIONBOOTTOOLS-$OSCODENAME-$OSRELEASE-$OSARCH-$GITRELEASE" NAMEHOSTCLIENT="$VERSIONBOOTTOOLS-$OSCODENAME-$GITRELEASE" export OSDISTRIB OSCODENAME OSRELEASE OSARCH OSHTTP diff --git a/client/boot-tools/boottoolsgenerator.sh b/client/boot-tools/boottoolsgenerator.sh index fb749a7b..79646a4a 100755 --- a/client/boot-tools/boottoolsgenerator.sh +++ b/client/boot-tools/boottoolsgenerator.sh @@ -75,7 +75,7 @@ echo "FASE 5 - Incorporando ficheros OpenGnsys al sistema raíz rootfs " cp -a ${BTDIR}/includes/usr/bin/* /tmp chmod +x /tmp/boot-tools/*.sh # Incluir revisión. -sed -i "1 s/$/ $GITRELEASE/" ${BTDIR}/includes/etc/initramfs-tools/scripts/VERSION.txt +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) schroot -p -c IMGogclient -- /tmp/boot-tools/boottoolsFsOpengnsys.sh 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 45805bd6..73b6a464 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-rc2 +OpenGnsys Client 1.1.1-rc5 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/boottoolsFsOpengnsys.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh index 85b00b69..62962927 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh @@ -34,8 +34,6 @@ then exit 1 fi - - #damos permiso al directorio de scripts chmod -R 775 ${SVNCLIENTDIR}/includes/usr/bin/* @@ -43,6 +41,7 @@ chmod -R 775 ${SVNCLIENTDIR}/includes/usr/bin/* cp -av ${SVNCLIENTDIR}/includes/* ${OGCLIENTMOUNT}/ mkdir -p ${OGCLIENTMOUNT}/opt/opengnsys/ cp -av ${SVNCLIENTSTRUCTURE}/* ${OGCLIENTMOUNT}/opt/opengnsys/ +mkdir -p ${OGCLIENTMOUNT}/opt/opengnsys/lib/engine/bin/ cp -av ${SVNCLIENTENGINE}/* ${OGCLIENTMOUNT}/opt/opengnsys/lib/engine/bin/ if [ $? -ne 0 ] @@ -62,19 +61,9 @@ cp -av ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/lib cp -av ${SVNCLIENTSTRUCTURE}/lib/qtplugins/* $OGCLIENTMOUNT/usr/local/plugins cp -av ${SVNCLIENTSTRUCTURE}/etc/*.qmap $OGCLIENTMOUNT/usr/local/etc -# Browser. -cp -av ${SVNCLIENTSTRUCTURE}/bin/browser $OGCLIENTMOUNT/bin -if [ $? -ne 0 ]; then - echo "$FUNCNAME(): Copying Browser : ERROR" - exit 1 -fi - -# ogAdmClient. -cp -av ${SVNCLIENTSTRUCTURE}/bin/ogAdmClient $OGCLIENTMOUNT/bin -if [ $? -ne 0 ]; then - echo "$FUNCNAME(): Copying ogAdmClient: ERROR" - exit 1 -fi +# Browser y ogAdmClient. +[ -x ${SVNCLIENTSTRUCTURE}/bin/browser ] && cp -av ${SVNCLIENTSTRUCTURE}/bin/browser $OGCLIENTMOUNT/bin +[ -x ${SVNCLIENTSTRUCTURE}/bin/ogAdmClient ] && cp -av ${SVNCLIENTSTRUCTURE}/bin/ogAdmClient $OGCLIENTMOUNT/bin # El fichero de configuración debe sustituir a los 2 ficheros (borrar las 2 líneas). echo "${VERSIONBOOTTOOLS}-${OSCODENAME}-${OSRELEASE}-${GITRELEASE}" > /$NAMEISOCLIENTFILE 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 afd8ff4c..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,12 +4,13 @@ install man-db install fbset install gdebi-core install bash-static -install busybox-static +install busybox-static install console-data install locales install lshw install gawk -install subversion +#install subversion # ogLive anterior a Ubuntu 18.04 +install git # ogLive a partir de Ubuntu 18.04 install python-openssl install python #install php5-cli # ogLive anterior a Ubuntu 16.04 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..93012f4a 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 @@ -1,12 +1,14 @@ #sw.other install screen install schroot -#install grub install xmlstarlet ############# UEFI install efibootmgr install efitools install refind +install grub-efi-amd64-bin +install grub-efi-ia32-bin +install grub-pc-bin ############# OGAgent install libxss1 install python-prctl @@ -16,7 +18,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 @@ -51,7 +53,6 @@ install laptop-detect #install nitrogen #install ttf-ubuntu-font-family #install time -#install openssh-client #install synaptic #install libglib-perl #install libgtk2-perl diff --git a/client/boot-tools/ogclientImg2Sqfs b/client/boot-tools/ogclientImg2Sqfs index 5dfb2b00..ea6f9509 100755 --- a/client/boot-tools/ogclientImg2Sqfs +++ b/client/boot-tools/ogclientImg2Sqfs @@ -26,7 +26,7 @@ OGCLIENTBASEDIR=$OPENGNSYS/tftpboot/ogclient/; OGCLIENTFILE=${OGCLIENTBASEDIR}ogclient.img; OGCLIENTSQFS=${OGCLIENTBASEDIR}ogclient.sqfs OGCLIENTMOUNT=${OGCLIENTBASEDIR}ogclientmount; -OGCLIENTSIZEMB=1900; +OGCLIENTSIZEMB=2100; OGCLIENTLABEL=ogClient; # Comprobamos que existe el cliente .sqfs diff --git a/client/boot-tools/ogclientSqfs2Img b/client/boot-tools/ogclientSqfs2Img index 4f8447da..e52b677c 100755 --- a/client/boot-tools/ogclientSqfs2Img +++ b/client/boot-tools/ogclientSqfs2Img @@ -29,7 +29,7 @@ OGCLIENTBASEDIR=$OPENGNSYS/tftpboot/ogclient/; OGCLIENTSQFS=${OGCLIENTBASEDIR}ogclient.sqfs OGCLIENTFILE=${OGCLIENTBASEDIR}ogclient.img; OGCLIENTMOUNT=${OGCLIENTBASEDIR}ogclientmount; -OGCLIENTSIZEMB=1900; +OGCLIENTSIZEMB=2100; OGCLIENTLABEL=ogClient; # Comprobamos que existe el cliente .sqfs |