diff options
| author | ramon <ramongomez@us.es> | 2017-03-07 08:32:17 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2017-03-07 08:32:17 +0000 |
| commit | 5cdd988710c9542244ca59071c8e226b61e7ce6d (patch) | |
| tree | 35c9d6d046ed287f71ea83f1085680b4775717bc /client/boot-tools | |
| parent | d244d7f1c9268dca5bcb9e66e4601723d4dc91dd (diff) | |
#774: Reducir tamaño de ogLive de 64 bits y montar librerías de 32 bits en el inicio.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5225 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/boot-tools')
| -rw-r--r-- | client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions | 3 | ||||
| -rwxr-xr-x | client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions b/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions index 6abb1207..0343dcb9 100644 --- a/client/boot-tools/includes/etc/initramfs-tools/scripts/ogfunctions +++ b/client/boot-tools/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/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh index 469c266a..267b646b 100755 --- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh +++ b/client/boot-tools/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/ |