diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions index 6abb120..0343dcb 100644 --- a/includes/etc/initramfs-tools/scripts/ogfunctions +++ b/includes/etc/initramfs-tools/scripts/ogfunctions @@ -528,7 +528,8 @@ 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. - for i in bin sbin lib etc var usr root boot; do + [ "$(uname -i)" != "i386" ] && LIBS=lib32 + for i in bin sbin lib $LIBS etc var usr root boot; do ogUnionLiveDir $i done cat /tmp/mtab.preunion > /etc/mtab diff --git a/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh b/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh index 469c266..267b646 100755 --- a/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh +++ b/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh @@ -64,7 +64,7 @@ console-setup console-setup/fontsize-fb47 select 8x16 davfs2 davfs2/suid_file boolean false kexec-tools kexec-tools/load_kexec boolean true EOT -apt-get -y install sshfs console-data kexec-tools davfs2 +apt-get -y install sshfs console-data kexec-tools davfs2 $PKGS32 #comenzamos con la instalación de los paquetes a instalar. for group in `find /usr/bin/boot-tools/listpackages/ -name sw.*` @@ -101,9 +101,6 @@ while read -e mod vers; do fi done < <(dkms status 2>/dev/null | awk -F, '$3~/added/ {print $1,$2}') -# Instalar en último lugar librarías de 32 bits para distribuciones de 64 bits. -[ -n "$PKGS32" ] && apt-get -y install $PKGS32 - #Activamos el hook del oginitrd.img mv /etc/initramfs-tools/oghooks /etc/initramfs-tools/hooks/