Merge pull request 'refs #2341: Removes ctorrent and adds mktorrent for torrent file creation' (#20) from add_mktorrent into main

Reviewed-on: #20

CHANGELOG.md

@@ -5,6 +5,30 @@ 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/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.9.2] - 2025-06-26
+
+### Fixed
+
+- Include dbus env var in .xinitrc
+
+## [3.9.1] - 2025-06-18
+
+### Fixed
+
+- Increase "open files" ulimit for the qt6 browser
+
+## [3.9.0] - 2025-06-16
+
+### Added
+
+- Take ogrepository SSH key from its git repo
+
+## [3.8.0] - 2025-06-16
+
+### Added
+
+- Installation of package opengnsys-gitlib
+
 ## [3.7.0] - 2025-05-28
 
 ### Changed

Dockerfile

@@ -30,7 +30,7 @@ ARG OPENGNSYS_HEAD
 COPY . /tmp/opengnsys/oglive_builder/
 
 RUN ls -la /tmp/opengnsys/oglive_builder/ && \
-    mv /tmp/opengnsys/oglive_builder/engine /tmp/opengnsys/oglive_builder/shared /tmp/opengnsys/ && \
+    mv /tmp/opengnsys/oglive_builder/engine /tmp/opengnsys/oglive_builder/shared /tmp/opengnsys/oglive_builder/ogrepo-ssh-key /tmp/opengnsys/ && \
     cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
     echo '' >/etc/schroot/default/nssdatabases && \
     rm -f /etc/schroot/setup.d/*chrootname

boottools/btog.py

@@ -205,7 +205,7 @@ def debootstrap (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp):
     logger.info (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}" : ok')
     return 0
 
-def copy_og_files (builder, og_shared, ogclientmount, osdistrib, oscodename):
+def copy_og_files (builder, og_shared, ogrepo_ssh_key, ogclientmount, osdistrib, oscodename):
     logger.info ('Iniciando la personalización con datos del repositorio')
 
     sources_list_in  = f'{builder}/includes/etc/apt/sources.list.{osdistrib.lower()}'
@@ -226,6 +226,12 @@ def copy_og_files (builder, og_shared, ogclientmount, osdistrib, oscodename):
     os.makedirs (f'{ogclientmount}/usr/local/lib',                 exist_ok=True)
     os.makedirs (f'{ogclientmount}/usr/local/plugins',             exist_ok=True)
 
+    os.makedirs (f'{ogclientmount}/root/.ssh', exist_ok=True)
+    shutil.copy (f'{ogrepo_ssh_key}/opengnsys',     f'{ogclientmount}/root/.ssh/id_ed25519')
+    shutil.copy (f'{ogrepo_ssh_key}/opengnsys.pub', f'{ogclientmount}/root/.ssh/id_ed25519.pub')
+    os.chmod (f'{ogclientmount}/root/.ssh/id_ed25519',     0o0600)
+    os.chmod (f'{ogclientmount}/root/.ssh/id_ed25519.pub', 0o0600)
+
     subprocess.run (f'rsync -aH {builder}/includes/* {ogclientmount}/'              , shell=True)
     subprocess.run (f'rsync -aH {og_shared}/*        {ogclientmount}/opt/opengnsys/', shell=True)
 

includes/etc/initramfs-tools/scripts/VERSION.txt

@@ -1 +1 @@
-OpenGnsys Client 3.7.0
+OpenGnsys Client 3.9.2

includes/etc/initramfs-tools/scripts/ogfunctions

@@ -591,6 +591,7 @@ ogUnionLiveDir()
 	U1STDIR="${OGLIVERAMFS}${TMPDIR}=RW"
 	U2NDDIR="${OGLIVEROOTFS}${TMPDIR}=RO"
 	UNIONDIR=${OGLIVEUNIONFS}${TMPDIR}
+	ulimit -n 4096
 	mkdir -p $UNIONDIR $TMPDIR
 	$UBIN $FUSE_OPT $UNION_OPT ${U1STDIR}:${U2NDDIR} $UNIONDIR
 	mount --bind  $UNIONDIR $TMPDIR

includes/usr/bin/launch_browser

@@ -1,32 +1,18 @@
 #!/bin/bash
 
-# Compatibilidad con los argumentos usados con el browser original:
-# browser -qws http://google.com
-#
+# Compatibilidad con los argumentos usados con el browser original: browser -qws http://google.com
 while getopts ":qwsDWX" opt ; do
 case $opt in
-    q)
-        echo "Ignoring option: -q"
-        ;;
-    w)
-        echo "Ignoring option: -w"
-        ;;
-    s)
-        echo "Ignoring option: -s"
-        ;;
-    D)
-        BROWSER_DEBUG=1
-        ;;
-    W)
-        DISABLE_WAYLAND=1
-        ;;
-    X)
-        DISABLE_X11=1
-        ;;
+    q) echo "Ignoring option: -q" ;;
+    w) echo "Ignoring option: -w" ;;
+    s) echo "Ignoring option: -s" ;;
+    D) BROWSER_DEBUG=1 ;;
+    W) DISABLE_WAYLAND=1 ;;
+    X) DISABLE_X11=1 ;;
     esac
 done
 
-shift $(expr $OPTIND - 1 )
+shift $(expr $OPTIND - 1)
 
 browser_args="$@"
 
@@ -42,52 +28,51 @@ if [ -n "BROWSER_DEBUG" ] ; then
     echo ""
 fi
 
-
-
 [ -x "/usr/bin/kitty" ] && wl_terminal=/usr/bin/kitty
 [ -x "/usr/bin/foot" ]  && wl_terminal=/usr/bin/foot
-
-[ -x "/usr/bin/xterm" ]                 && x11_terminal=/usr/bin/kitty
-[ -x "/usr/bin/i3-sensible-terminal" ]  && x11_terminal=/usr/bin/i3-sensible-terminal
+#[ -x "/usr/bin/xterm" ]                 && x11_terminal=/usr/bin/kitty
+#[ -x "/usr/bin/i3-sensible-terminal" ]  && x11_terminal=/usr/bin/i3-sensible-terminal
 
 # The admin page is hosted remotely but executes things on localhost
 QTWEBENGINE_CHROMIUM_FLAGS="--disable-web-security"
 
 [ "$UID" -eq "0" ] && QTWEBENGINE_CHROMIUM_FLAGS="${QTWEBENGINE_CHROMIUM_FLAGS} --no-sandbox"
-
 export QTWEBENGINE_CHROMIUM_FLAGS
 
-rm -rf "/run/sway.started" "/run/x11.started"
 
+
+## sway
 mkdir -p $HOME/.config/sway
-echo "exec /usr/bin/OGBrowser --ignore-ssl-errors \"$browser_args\" || /usr/bin/browser -qws \"$browser_args\"" > $HOME/.config/sway/config
-
+echo "exec /usr/bin/OGBrowser --ignore-ssl-errors \"$browser_args\"" > $HOME/.config/sway/config
 if [ -n "BROWSER_DEBUG" ] ; then
     echo "bindsym Mod4+Return exec $wl_terminal"  >> $HOME/.config/sway/config
     echo "bindsym Control+Alt+Backspace exit"     >> $HOME/.config/sway/config
 fi
-
 echo "exec touch /run/sway.started"     >> $HOME/.config/sway/config
 
-
+## i3
 mkdir -p $HOME/.config/i3
-echo "exec /usr/bin/OGBrowser --ignore-ssl-errors \"$browser_args\" || /usr/bin/browser -qws \"$browser_args\"" > $HOME/.config/i3/config
-
+echo "exec /usr/bin/OGBrowser --ignore-ssl-errors \"$browser_args\"" > $HOME/.config/i3/config
 if [ -n "BROWSER_DEBUG" ] ; then
     echo "bindsym Mod4+Return exec i3-sensible-terminal"  >> $HOME/.config/i3/config
     echo "bindsym Control+Mod1+BackSpace exit"            >> $HOME/.config/i3/config
 fi
-
 echo "exec touch /run/x11.started"                    >> $HOME/.config/i3/config
 
-echo "exec /usr/bin/i3"    > $HOME/.xinitrc
-echo "exec /usr/bin/xterm" >> $HOME/.xinitrc
+## xinitrc
+if [[ -z $DBUS_SESSION_BUS_ADDRESS ]]; then eval $(cat /proc/$(pidof OGAgent)/environ |sed -e 's/\x00/\x0a/g' |grep DBUS_SESSION_BUS_ADDRESS); fi
+echo "export DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS" > $HOME/.xinitrc
+echo "exec /usr/bin/i3"                                          >> $HOME/.xinitrc
+echo "exec /usr/bin/xterm"                                       >> $HOME/.xinitrc
 
 
 # Make sure libinput works
 /usr/bin/udevadm trigger
 
 
+## go
+rm -rf "/run/sway.started" "/run/x11.started"
+
 if [ -x "/usr/bin/sway" -a -z "$DISABLE_WAYLAND" ] ; then
     echo "*** Trying to launch Sway ***"
     /usr/bin/sway
@@ -112,5 +97,3 @@ if [ ! -f "/run/sway.started" -a ! -f "/run/x11.started" ] ; then
 else
     echo "All done."
 fi
-
-

mkoglive.cfg

@@ -112,7 +112,7 @@ monitoring = htop ncdu bwbar bmon iftop ifstat dstat hdparm sdparm blktool testd
 
 networking = netpipes curl wget tftp-hpa dnsutils
   #trickle       # ubuntu noble: has no installation candidate
-  lighttpd ethtool ssmping tcpdump nmap arping ntpdate ctorrent udpcast #iptraf
+  lighttpd ethtool ssmping tcpdump nmap arping ntpdate udpcast aria2 mktorrent #iptraf
 
 testing =
   screen schroot xmlstarlet
@@ -135,4 +135,4 @@ ogagent = stunnel4
 
 ogbrowser = sway libinput-tools hwdata ogbrowser
 
-oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm
+oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip python3-hivex opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid opengnsys-gitlib ntfs-3g-system-compression python3-tqdm

mkoglive.py

@@ -75,9 +75,10 @@ def _initramfs_version (gitrelease, osrelease, curdir):
 
 def _copy_og_files (btrootfsimg, btrootfsmnt, osdistrib, oscodename):
     _mount_rootfs (btrootfsimg, btrootfsmnt)
-    builder   = '/tmp/opengnsys/oglive_builder'
-    og_shared = '/tmp/opengnsys/shared'
-    btog.copy_og_files (builder, og_shared, btrootfsmnt, osdistrib, oscodename)
+    builder        = '/tmp/opengnsys/oglive_builder'
+    og_shared      = '/tmp/opengnsys/shared'
+    ogrepo_ssh_key = '/tmp/opengnsys/ogrepo-ssh-key'
+    btog.copy_og_files (builder, og_shared, ogrepo_ssh_key, btrootfsmnt, osdistrib, oscodename)
     utils.umount (btrootfsmnt)
 
 def _chroot_tasks (cfgfile, curdir, osrelease, osarch):