refs #1161 adds old browser

boottools/btog.py

@@ -238,6 +238,9 @@ def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, osco
     subprocess.run (f'rsync -aH {og_shared}/lib/qtlib/*     {ogclientmount}/usr/local/lib',     shell=True)
     subprocess.run (f'rsync -aH {og_shared}/lib/fonts       {ogclientmount}/usr/local/lib',     shell=True)
     subprocess.run (f'rsync -aH {og_shared}/lib/qtplugins/* {ogclientmount}/usr/local/plugins', shell=True)
+    
+    # Browser
+    if os.path.exists (f'{og_shared}/bin/browser'):     shutil.copy (f'{og_shared}/bin/browser',     f'{ogclientmount}/bin/')
 
 def sysctl (btrootfsmnt):
     logger.debug ('copiando sysctl.conf')

includes/etc/initramfs-tools/scripts/ogfunctions

@@ -31,6 +31,7 @@ echo "qindel: ind ($ind)" 1>&2
 # Buscar el dispositivo del índice.
 dev=""
 for f in /sys/class/net/*/uevent; do
+    echo "qindel: considering file ($f)" 1>&2
 	source $f
 	let aux=$IFINDEX-1
 	if [ "$ind" = "$INTERFACE" -o "$ind" = $aux ]; then echo "qindel: ind ($ind) == INTERFACE ($INTERFACE) -o ind ($ind) == aux ($aux), setting dev to ($INTERFACE)" 1>&2; dev="$INTERFACE"; fi
@@ -475,6 +476,15 @@ ogConnect ()
 			nfsmount  ${SERVER}:${SRC} ${DST} -o nolock${READONLY} 2> /dev/null || mount.nfs ${SERVER}:${SRC} ${DST} -o nolock${READONLY}
 		;;
 		smb)
+			echo "qindel: SERVER: $SERVER"
+			echo "qindel: SRC: $SRC"
+			echo "qindel: DST: $DST"
+			echo "qindel: OPTIONS: $OPTIONS"
+			echo "qindel: READONLY: $READONLY"
+			
+			ping -c 3 $SERVER
+			chmod u+s /usr/sbin/mount.cifs
+			chown 1:1001 /usr/sbin/mount.cifs
 			mount.cifs //${SERVER}/${SRC} ${DST} ${OPTIONS}${READONLY}		
 		;;
 		local)
@@ -632,7 +642,7 @@ ogConfigureLoopback()
 #*/ ##
 ogConfigureNetworking()
 {
-#echo "ogConfigureNetworking: Buscando interfaz a configurar DEVICE"
+echo "qindel: ogConfigureNetworking: Buscando interfaz a configurar DEVICE"
 if [ -n "${BOOTIF}" ] 
 then
 	#echo " variable BOOTIF exportada con pxelinux.0 con valor $BOOTIF"
@@ -697,11 +707,13 @@ fi
 # Activamos la interfaz antes de configurar.
 ip address flush $DEVICE
 ip link set dev $DEVICE up
+echo "qindel: Carrier detected, configuring $DEVICE"
 # Si no se detecta señal portadora volver a configurar.
 sleep 1
 CARRIER=$(cat /sys/class/net/${DEVICE}/carrier)
 if [ "$CARRIER" != "1" ]
 then
+    echo "qindel: Carrier not detected, trying ogConfigureNetworking again"
 	ogConfigureNetworking
 fi
 

includes/etc/initramfs-tools/scripts/oginit

@@ -82,10 +82,14 @@ mountroot ()
     [ $? == 0 ] && sh || echo " "
 	if [ -n "$oglive" ]
 	then
+		attempts=0
 		while !(ping -c 1 $oglive &> /dev/null)
 		do
+			attempts=$((attempts+1))
+			echo "Attempt $attempts: Waiting for network connection... attempting to ping $oglive"
 			ogConfigureNetworking
 		done
+		echo "Connection established after $attempts attempts."
 	fi
 	log_success_msg "config networking"
 	ogConfigureLoopback