Merge branch 'main' into fix_video_problem

CHANGELOG.md

@@ -5,6 +5,18 @@ 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.14.2] - 2025-09-30
+
+### Changed
+
+- Don't let mksquashfs take all CPU cores
+
+## [3.14.1] - 2025-09-24
+
+### Fixed
+
+- Fix jenkins build with REUSE_PREV_FS=true
+
 ## [3.14.0] - 2025-08-14
 
 ### Added

Jenkinsfile

@@ -112,8 +112,8 @@ else
     ls -la ogclient/ || true
 fi
 mkdir -p ogclient    ## run this as user; otherwise docker may create it as root
-if [[ "zuser" != "z$(stat --format %U ogclient)" ]]; then
-  echo "warning: directory 'ogclient' not owned by user 'user'"
+if [[ "zjenkins" != "z$(stat --format %U ogclient)" ]]; then
+  echo "warning: directory 'ogclient' not owned by user 'jenkins'"
 fi
 
 docker run --rm --name mkoglive --privileged=true \

boottools/btog.py

@@ -327,8 +327,18 @@ def mksquashfs (bttargetdir, btrootfsmnt):
         now = datetime.datetime.now(datetime.timezone.utc).strftime ('%Y%m%d-%H%M%S%z')
         os.rename (f'{bttargetdir}/ogclient.sqfs', f'{bttargetdir}/ogclient.sqfs.{now}')
 
-    ## uses all CPU cores available, even within docker
-    utils.run (['mksquashfs', btrootfsmnt, f'{bttargetdir}/ogclient.sqfs', '-e', 'var/lib/apt/lists', '-e', 'usr/share/doc'])
+    ## for some reason mksqashfs uses all CPU cores available, even within docker
+    ## so, let's count the number of cores...
+    fd = open ('/proc/cpuinfo', 'r')
+    nproc = 0
+    while True:
+        line = fd.readline()
+        if not line: break
+        if 'processor' in line: nproc += 1
+    ## ...and leave one core unused
+    nproc = str (nproc-1)
+
+    utils.run (['mksquashfs', btrootfsmnt, f'{bttargetdir}/ogclient.sqfs', '-processors', nproc, '-e', 'var/lib/apt/lists', '-e', 'usr/share/doc'])
     os.chmod (f'{bttargetdir}/ogclient.sqfs', 0o744)
 
     utils.write_md5 (f'{bttargetdir}/ogclient.sqfs')

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

@@ -1 +1 @@
-OpenGnsys Client 3.14.0
+OpenGnsys Client 3.14.2

schroot.conf

@@ -1,10 +1,17 @@
 [IMGogclient]
 type=loopback
 file=/var/lib/tftpboot/ogclient/ogclient.img
+mount-options=-o offset=32256
+
 description=ogclient Ubuntu image
-#priority=1
 users=root
 groups=root
 root-groups=root
-mount-options=-o offset=32256
 root-users=root
+
+## man 5 schroot.conf
+## "In addition to the configuration keys listed above, it is possible to add custom keys. These keys will be used to add additional environment variables to the setup script environment when setup scripts are run"
+## We need this because in chroot-tasks.py setup_resolvconf2() we create a symlink /etc/resolv.conf -> /run/resolvconf/resolv.conf
+## On the second run of the jenkins job, with REUSE_PREV_FS = true, schroot tries to copy /etc/resolv.conf but it now points to a non-existent file, making schroot fail
+## With this line, we tell schroot not to copy any files to the chroot
+setup.copyfiles=