Reviewed-on: #26filebeat-home 3.12.1
commit
ddac2c471c
|
|
@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [3.12.1] - 2025-08-05
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Save a log of early init (oginit/ogfuncions)
|
||||||
|
|
||||||
## [3.12.0] - 2025-07-31
|
## [3.12.0] - 2025-07-31
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
OpenGnsys Client 3.12.0
|
OpenGnsys Client 3.12.1
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -32,115 +32,104 @@
|
||||||
#@date 2013/02/18
|
#@date 2013/02/18
|
||||||
#*/
|
#*/
|
||||||
|
|
||||||
|
og_ask() {
|
||||||
# Parameter: Where to mount the filesystem
|
echo "$1" >>/tmp/oginit.log
|
||||||
mountroot ()
|
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "$1: y/N "; [ $? == 0 ] && sh || echo " "
|
||||||
{
|
}
|
||||||
[ -f /scripts/VERSION.txt ] && OGVERSION=$(cat /scripts/VERSION.txt)
|
|
||||||
OGVERSION=${OGVERSION:-"OpenGnsys Client"}
|
mountroot () {
|
||||||
echo; echo; echo "$OGVERSION"; echo; echo
|
[ -f /scripts/VERSION.txt ] && OGVERSION=$(cat /scripts/VERSION.txt)
|
||||||
|
OGVERSION=${OGVERSION:-"OpenGnsys Client"}
|
||||||
#[ "$quiet" != "y" ] && log_begin_msg "Running OpenGnsys /scripts/og-top"
|
echo; echo; echo "$OGVERSION"; echo; echo
|
||||||
#run_scripts /scripts/og-top
|
|
||||||
#[ "$quiet" != "y" ] && log_end_msg
|
#[ "$quiet" != "y" ] && log_begin_msg "Running OpenGnsys /scripts/og-top"
|
||||||
|
#run_scripts /scripts/og-top
|
||||||
# If the root device hasn't shown up yet, give it a little while
|
#[ "$quiet" != "y" ] && log_end_msg
|
||||||
# to deal with removable devices
|
|
||||||
|
. /scripts/functions
|
||||||
. /scripts/functions
|
. /scripts/ogfunctions
|
||||||
. /scripts/ogfunctions
|
|
||||||
|
# If the root device hasn't shown up yet, give it a little while
|
||||||
sleep 2
|
# to deal with removable devices
|
||||||
|
sleep 2
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before get OG variables: y/N "
|
|
||||||
[ $? == 0 ] && sh || echo " "
|
|
||||||
set -a
|
og_ask "Stop before get OG variables"
|
||||||
log_success_msg "Checking kernel parameters"
|
set -a
|
||||||
ogExportKernelParameters
|
log_success_msg "Checking kernel parameters"
|
||||||
# Cambiar resolución de vídeo para kernels que usan el parámetro "video".
|
ogExportKernelParameters
|
||||||
[ -n "$video" ] && ogChangeVideoResolution
|
[ -n "$video" ] && ogChangeVideoResolution # Cambiar resolución de vídeo para kernels que usan el parámetro "video".
|
||||||
log_success_msg "Checking OpenGnsys Environmnet"
|
log_success_msg "Checking OpenGnsys Environmnet"
|
||||||
ogExportVarEnvironment
|
ogExportVarEnvironment
|
||||||
|
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure ramfs structure for OG: y/N "
|
|
||||||
[ $? == 0 ] && sh || echo " "
|
og_ask "Stop before configure ramfs structure for OG"
|
||||||
ogConfigureRamfs
|
ogConfigureRamfs
|
||||||
|
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure netmoule specified in kernel parameters: y/N "
|
|
||||||
[ $? == 0 ] && sh || echo " "
|
og_ask "Stop before configure netmoule specified in kernel parameters"
|
||||||
ogLoadNetModule
|
ogLoadNetModule
|
||||||
|
|
||||||
#[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/og-premount"
|
#[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/og-premount"
|
||||||
#run_scripts /scripts/og-premount
|
#run_scripts /scripts/og-premount
|
||||||
#[ "$quiet" != "y" ] && log_end_msg
|
#[ "$quiet" != "y" ] && log_end_msg
|
||||||
|
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure networking: y/N "
|
|
||||||
[ $? == 0 ] && sh || echo " "
|
og_ask "Stop before configure networking"
|
||||||
if [ -n "$oglive" ]
|
if [ -n "$oglive" ]; then
|
||||||
then
|
while !(ping -c 1 $oglive &> /dev/null); do
|
||||||
while !(ping -c 1 $oglive &> /dev/null)
|
ogConfigureNetworking
|
||||||
do
|
done
|
||||||
ogConfigureNetworking
|
fi
|
||||||
done
|
log_success_msg "config networking"
|
||||||
fi
|
ogConfigureLoopback
|
||||||
log_success_msg "config networking"
|
log_success_msg "config loopback"
|
||||||
ogConfigureLoopback
|
|
||||||
log_success_msg "config loopback"
|
|
||||||
|
og_ask "Stop before detect rootserver"
|
||||||
|
ogGetROOTSERVER && log_success_msg "Get Info from pxe server and ckeck distribuited OG services "
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before detect rootserver: y/N "
|
|
||||||
[ $? == 0 ] && sh || echo " "
|
|
||||||
ogGetROOTSERVER && log_success_msg "Get Info from pxe server and ckeck distribuited OG services "
|
if [ "$ogupdateinitrd" == "true" ]; then
|
||||||
|
og_ask "Stop before check updating initrd"
|
||||||
|
fi
|
||||||
if [ "$ogdebug" == "true" -a "$ogupdateinitrd" == "true" ]; then
|
if [ "$ogupdateinitrd" == "true" -o ! -d /lib/modules/$(uname -r) ]; then
|
||||||
ogYesNo --timeout 5 --default no "Stop before check updating initrd: y/N "
|
ogUpdateInitrd # Actualizar Initrd si se solicita o si no se corresponde con su kernel.
|
||||||
[ $? == 0 ] && sh || echo " "
|
fi
|
||||||
fi
|
|
||||||
# Actualizar Initrd si se solicita o si no se corresponde con su kernel.
|
|
||||||
if [ "$ogupdateinitrd" == "true" -o ! -d /lib/modules/$(uname -r) ]; then
|
og_ask "Stop before connect and merging the rootfs -ogLive- with $OGSERVERLIVE"
|
||||||
ogUpdateInitrd
|
ogConnectOgLive && log_success_msg "Merge the initrd with the remote rootfs -ogLive- on $OGSERVERLIVE" || sh
|
||||||
fi
|
# si es necesario realiza ogConnect $OGSERVERLIVE $OGPROTOCOL $SRCOGLIVE $DSTOGLIVE
|
||||||
|
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect and merging the rootfs -ogLive- with $OGSERVERLIVE: y/N "
|
|
||||||
[ $? == 0 ] && sh || echo " "
|
og_ask "Stop before connect with client dir SHARE -engine,scripts,interface, -share- on $OGSERVERSHARE "
|
||||||
ogConnectOgLive && log_success_msg "Merge the initrd with the remote rootfs -ogLive- on $OGSERVERLIVE" || sh
|
ogConnect $OGSERVERSHARE $OGPROTOCOL $SRCOGSHARE $DSTOGSHARE
|
||||||
# si es necesario realiza ogConnect $OGSERVERLIVE $OGPROTOCOL $SRCOGLIVE $DSTOGLIVE
|
if [ $? -ne 0 -a "$SRCOGSHARE" != "$DEFOGSHARE" ]; then
|
||||||
|
ogConnect $OGSERVERSHARE $OGPROTOCOL $DEFOGSHARE $DSTOGSHARE && SRCOGSHARE=$DEFOGSHARE
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with client dir SHARE -engine,scripts,interface, -share- on $OGSERVERSHARE : y/N "
|
fi
|
||||||
[ $? == 0 ] && sh || echo " "
|
unset DEFOGSHARE
|
||||||
ogConnect $OGSERVERSHARE $OGPROTOCOL $SRCOGSHARE $DSTOGSHARE
|
|
||||||
if [ $? -ne 0 -a "$SRCOGSHARE" != "$DEFOGSHARE" ]; then
|
|
||||||
ogConnect $OGSERVERSHARE $OGPROTOCOL $DEFOGSHARE $DSTOGSHARE && SRCOGSHARE=$DEFOGSHARE
|
og_ask "Stop before connect with client dir LOG STORAGE on $OGSERVERLOG "
|
||||||
fi
|
ogConnect $OGSERVERLOG $OGPROTOCOL $SRCOGLOG $DSTOGLOG
|
||||||
unset DEFOGSHARE
|
|
||||||
|
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with client dir LOG STORAGE on $OGSERVERLOG : y/N "
|
og_ask "Stop before connect with REPOSITORY STORAGE on $OGSERVERIMAGES "
|
||||||
[ $? == 0 ] && sh || echo " "
|
ogConnect $OGSERVERIMAGES $OGPROTOCOL $SRCOGIMAGES $DSTOGIMAGES ,ro
|
||||||
ogConnect $OGSERVERLOG $OGPROTOCOL $SRCOGLOG $DSTOGLOG
|
|
||||||
|
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with REPOSITORY STORAGE on $OGSERVERIMAGES : y/N "
|
og_ask "Stop before doing the postconfiguration"
|
||||||
[ $? == 0 ] && sh || echo " "
|
ogPostConfigureFS
|
||||||
ogConnect $OGSERVERIMAGES $OGPROTOCOL $SRCOGIMAGES $DSTOGIMAGES ,ro
|
setupcon -k
|
||||||
|
|
||||||
|
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before doing the postconfiguration: y/N "
|
og_ask "Stop before calling oginit with /etc/inittab"
|
||||||
[ $? == 0 ] && sh || echo " "
|
if [ "$oginit" ]; then
|
||||||
ogPostConfigureFS
|
echo "exec oginit ($oginit)" >>/tmp/oginit.log
|
||||||
setupcon -k
|
exec $oginit
|
||||||
|
else
|
||||||
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before calling oginit with /etc/inittab: y/N "
|
echo "exec regular init" >>/tmp/oginit.log
|
||||||
[ $? == 0 ] && sh || echo " "
|
exec init
|
||||||
|
fi
|
||||||
if [ "$oginit" ]
|
|
||||||
then
|
|
||||||
exec $oginit
|
|
||||||
else
|
|
||||||
exec init
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue