opengnsys
/
oglive-builder
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#768: Crear clientes con soporte de variable {{{ogclient}}} para usar varios ogLive, define ogLive por defecto compatible con los clientes OGClient y con soporte basado en Ubuntu 16.04 con Kernel 4.8. 

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5131 a21b9725-9963-47de-94b9-378ad31fedc9
remotes/github/master
ramon 2016-12-20 08:51:51 +00:00
parent f7c7d35583
commit 06f8baeffc
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
boottoolsfunctions.lib
View File

@ -97,13 +97,20 @@ case "${1,,}" in
OSARCH="i386"
OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
;;
xenial) # ogLive 1.1.0-rc4 basado en Ubuntu 16.04.
xenial|xenial-4.4) # ogLive 1.1.0-rc4 basado en Ubuntu 16.04 y Kernel 4.4.
OSDISTRIB="ubuntu"
OSCODENAME="xenial"
OSRELEASE="4.4.0-34-generic"
OSARCH="i386"
OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
;;
xenial-4.8) # ogLive 1.1.0-rc5 basado en Ubuntu 16.04 y Kernel 4.8.
OSDISTRIB="ubuntu"
OSCODENAME="xenial"
OSRELEASE="4.8.0-30-generic"
OSARCH="i386"
OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
;;
host | *) # ogLive basado en la distribución del servidor.
OSDISTRIB=$(lsb_release -is)
OSCODENAME=$(lsb_release -cs)

7
includes/etc/initramfs-tools/scripts/ogfunctions
View File

@ -133,7 +133,8 @@ ogExportVarEnvironment ()
;;
smb|SMB|cifs|CIFS|samba|SAMBA)
export SRCOGLIVE="tftpboot" && echo "SRCOGLIVE=$SRCOGLIVE" >> $CFGINITRD
export SRCOGSHARE="ogclient" && echo "SRCOGSHARE=$SRCOGSHARE" >> $CFGINITRD
export DEFOGSHARE="ogclient"
export SRCOGSHARE="${oglive:-$DEFOGSHARE}" && echo "SRCOGSHARE=$SRCOGSHARE" >> $CFGINITRD
export SRCOGLOG="oglog" && echo "SRCOGLOG=$SRCOGLOG" >> $CFGINITRD
export SRCOGIMAGES="ogimages$OGUNIT" && echo "SRCOGIMAGES=$SRCOGIMAGES" >> $CFGINITRD
;;
@ -454,7 +455,11 @@ ogConnect ()
# TODO: buscar condicion para NFS
fi
;;
*)
return 1
;;
esac
return $?
}

4
includes/etc/initramfs-tools/scripts/oginit
View File

@ -110,6 +110,10 @@ mountroot ()
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with client dir SHARE -engine,scripts,interface, -share- on $OGSERVERSHARE : y/N "
[ $? == 0 ] && sh || echo " "
ogConnect $OGSERVERSHARE $OGPROTOCOL $SRCOGSHARE $DSTOGSHARE
if [ $? -ne 0 -a "$SRCOGSHARE" != "$DEFOGSHARE"]; then
ogConnect $OGSERVERSHARE $OGPROTOCOL $DEFOGSHARE $DSTOGSHARE && SRCOGSHARE=$DEFOGSHARE
fi
unset DEFOGSHARE
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with client dir LOG STORAGE on $OGSERVERLOG : y/N "
[ $? == 0 ] && sh || echo " "