#802: Cambios para crear cliente ogLive basado en Ubuntu 18.04 con Kernel 4.15
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5698 a21b9725-9963-47de-94b9-378ad31fedc9remotes/github/master
ramon
parent
8e89eabc07
commit
9d8fe69c7e
|
|
@ -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/"
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
history -c
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue