diff options
7 files changed, 41 insertions, 38 deletions
diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib index 00eb02d8..babb2e06 100755 --- a/client/boot-tools/boottoolsfunctions.lib +++ b/client/boot-tools/boottoolsfunctions.lib @@ -122,10 +122,10 @@ case "${1,,}" in OSARCH="amd64" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; - artful) # ogLive 1.1.1-rc1 basado en Ubuntu 17.10 y Kernel 4.13. + bionic) # ogLive 1.1.1-rc1 basado en Ubuntu 18.04 y Kernel 4.15. OSDISTRIB="ubuntu" - OSCODENAME="artful" - OSRELEASE="4.13.0-37-generic" + OSCODENAME="bionic" + OSRELEASE="4.15.0-13-generic" OSARCH="amd64" OSHTTP="http://es.archive.ubuntu.com/ubuntu/" ;; diff --git a/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions b/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions index 0ea1f720..f7d712d9 100644 --- a/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions +++ b/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions @@ -546,7 +546,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. - [ -d $DSTOGLIVE/lib32 ] && LIBS=lib32 + [ -d $OGLIVEROOTFS/lib32 ] && LIBS=lib32 for i in bin sbin lib $LIBS etc var usr root boot; do ogUnionLiveDir $i done diff --git a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsLocales.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsLocales.sh index 63d36943..c1f04868 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsLocales.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsLocales.sh @@ -1,6 +1,13 @@ #!/bin/bash -dpkg-reconfigure console-data -dpkg-reconfigure console-setup -dpkg-reconfigure locales +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 -history -c
\ No newline at end of file +history -c 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 7d301895..9ead10a3 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsInitrdGenerate.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsInitrdGenerate.sh @@ -5,8 +5,8 @@ OGCLIENTCFG=${OGCLIENTCFG:-/tmp/ogclient.cfg} OSRELEASE=${OSRELEASE:-$(uname -r)} rm -f /usr/lib/initramfs-tools/bin/* -cp /bin/busybox ./ -cd /tmp/ +cp /bin/busybox /usr/lib/initramfs-tools/bin +cd /tmp mkinitramfs -o /tmp/initrd.img-$OSRELEASE -v $OSRELEASE cp -v /boot/vmlinuz-$OSRELEASE.efi.signed /tmp 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 b74946e6..9a9fb764 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh @@ -19,29 +19,25 @@ which ms-sys || ms-sys install &>/dev/null echo "spartlnx" which spartlnx.run || $(wget http://damien.guibouret.free.fr/savepart.zip &>/dev/null; unzip -o savepart.zip -d /sbin/) -echo "busybox" -apt-get install -y busybox-static -cp /bin/busybox /bin/busyboxNEW -/bin/busyboxNEW - # Mach-O loader for Linux -echo "maloader" -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 +#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 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 de2ec722..5ad01285 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh +++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh @@ -57,12 +57,12 @@ fi # Valores para paquetes interactivos. cat << EOT | debconf-set-selections -- -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 TerminusBold -console-setup console-setup/fontsize-fb47 select 8x16 +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 davfs2 $PKGS32 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 4b7e8217..afd8ff4c 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,8 +4,7 @@ install man-db install fbset install gdebi-core install bash-static -#La gestion del busybox-static (incompatibilidades reboot y poweroff) en boottoolSoftwareCompile.sh -#install busybox-static +install busybox-static install console-data install locales install lshw @@ -18,6 +17,7 @@ install php-cli # ogLive a partir de Ubuntu 16.04 install dmidecode #install realpath # ogLive hasta Ubuntu 16.04 install rpm +#install zypper # PROBAR install sqlite3 install os-prober install moreutils |