From 10c705f5df80016887cfa470c4e904a0f7705448 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 4 Sep 2025 11:09:18 +0200 Subject: [PATCH 1/6] refs #2660 do not take ogagent/ogbrowser from the local filesystem --- chroot-tasks.py | 2 +- mkoglive.cfg | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/chroot-tasks.py b/chroot-tasks.py index 362c65f..97e76de 100755 --- a/chroot-tasks.py +++ b/chroot-tasks.py @@ -40,7 +40,7 @@ def boottoolsSoftwareInstall (osarch, osrelease): subprocess.run (['debconf-set-selections'], input=debconf_settings, text=True) utils.run (['dpkg-reconfigure', '--frontend', 'noninteractive', 'console-setup', 'locales']) ## XXX: despues de esto, debconf-get-selections devuelve los valores antiguos, no se por que... - pkgs = glob.glob ('/tmp/opengnsys/oglive_builder/ogagent_*.deb') + glob.glob ('/tmp/opengnsys/oglive_builder/OGBrowser*.deb') + pkgs = [] for section in config.options('Packages'): pkgs += re.split (r'[ \n]', config['Packages'].get(section).strip()) diff --git a/mkoglive.cfg b/mkoglive.cfg index b56b62a..68c8b51 100644 --- a/mkoglive.cfg +++ b/mkoglive.cfg @@ -70,11 +70,6 @@ isolinux_template = basic = dialog man-db fbset gdebi-core bash-static busybox-static locales lshw gawk git python3-openssl python3 php-cli dmidecode rpm sqlite3 os-prober moreutils jq - #console-data # ogLive anterior a Ubuntu 20.04 - #subversion # ogLive anterior a Ubuntu 18.04 - #php5-cli # ogLive anterior a Ubuntu 16.04 - #realpath # ogLive hasta Ubuntu 16.04 - #zypper # PROBAR cloning = fsarchiver pv #pxe-kexec # ubuntu noble: Unable to locate package @@ -82,7 +77,6 @@ cloning = fsarchiver pv compile = build-essential libattr1 libattr1-dev uuid-dev attr make m4 gettext libmhash-dev - #libattr* # Satura el tamaño del archivo en Ubuntu 15.04 compressor = lzma zip unzip gzip lzop pigz pbzip2 lbzip2 rzip p7zip-full @@ -96,17 +90,9 @@ filesystem_local = android-tools-adb # ogLive a partir de Ubuntu 16.04 android-tools-fastboot # ogLive a partir de Ubuntu 16.04 f2fs-tools - #drbl-ntfsprogs # Eliminado - #ntfs-config # ogLive anterior a Ubuntu 20.04 - #btrfs-tools # ogLive anterior a Ubuntu 20.04 - #ufsutils # ogLive anterior a Ubuntu 14.04 - #zfsutils # ogLive anterior a Ubuntu 16.04 - #android-tools-fsutils # ogLive entre Ubuntu 16.04 y Ubuntu 20.04 filesystem_remote = sshfs cifs-utils smbclient open-iscsi openssh-server - #nfs-common # Provoca error de instalación en Ubuntu 15.04 - #bittornado # ogLive anterior a Ubuntu 20.04 monitoring = htop ncdu bwbar bmon iftop ifstat dstat hdparm sdparm blktool testdisk kitty-terminfo @@ -117,12 +103,7 @@ networking = netpipes curl wget tftp-hpa dnsutils testing = screen schroot xmlstarlet efibootmgr efitools refind grub-efi-amd64-bin grub-efi-ia32-bin grub-pc-bin ## UEFI - #libxss1 python-prctl python-six python-requests ## OGAgent - ############## fusioninventory-agent nvme-cli disktype laptop-detect - #discover casper lupin-casper xinit obconf xserver-xorg x11-xserver-utils xterm network-manager-gnome plymouth-x11 plymouth-label plymouth-theme-ubuntu-logo pcmanfm chromium-browser gtk-theme-switch gtk2-engines murrine-themes - ####################################3 - #gnome-icon-theme gnome-brave-icon-theme dmz-cursor-theme python-wnck python-xlib python-pyinotify python-alsaaudio python-vte maximus gpicview leafpad lxappearance lxmenu-data lxrandr lxterminal nitrogen ttf-ubuntu-font-family time synaptic libglib-perl libgtk2-perl libxml-simple-perl smartmontools gnome-disk-utility policykit-1-gnome policykit-desktop-privileges baobab lshw-gtk usb-creator-gtk wodim curlftpfs libnotify-bin cryptsetup system-config-lvm xwindows = v86d # VESA Kernel 3.7+ From 52b0778c755e7c62aaae18573cb565d3827244bf Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 4 Sep 2025 12:00:18 +0200 Subject: [PATCH 2/6] refs #2660 use the nightly repo --- includes/etc/apt/sources.list.ubuntu | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/etc/apt/sources.list.ubuntu b/includes/etc/apt/sources.list.ubuntu index a6b7dfd..6c1fb13 100644 --- a/includes/etc/apt/sources.list.ubuntu +++ b/includes/etc/apt/sources.list.ubuntu @@ -59,5 +59,4 @@ deb http://free.nchc.org.tw/ubuntu OSCODENAME-security main restricted universe #deb-src http://ppa.launchpad.net/zfs-native/stable/ubuntu OSCODENAME main -deb [trusted=yes] https://ognproject.evlt.uma.es/debian-opengnsys/opengnsys OSCODENAME main - +deb [trusted=yes] https://ognproject.evlt.uma.es/debian-opengnsys/nightly OSCODENAME main From bd90ba907263f2c76b76c47b2cd9a55d582d202f Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 4 Sep 2025 12:08:25 +0200 Subject: [PATCH 3/6] refs #2660 fix url--seems to have "main" twice --- includes/etc/apt/sources.list.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/etc/apt/sources.list.ubuntu b/includes/etc/apt/sources.list.ubuntu index 6c1fb13..117a498 100644 --- a/includes/etc/apt/sources.list.ubuntu +++ b/includes/etc/apt/sources.list.ubuntu @@ -59,4 +59,4 @@ deb http://free.nchc.org.tw/ubuntu OSCODENAME-security main restricted universe #deb-src http://ppa.launchpad.net/zfs-native/stable/ubuntu OSCODENAME main -deb [trusted=yes] https://ognproject.evlt.uma.es/debian-opengnsys/nightly OSCODENAME main +deb [trusted=yes] https://ognproject.evlt.uma.es/debian-opengnsys/nightly/main OSCODENAME main From 4e0114da16ce11df6b7270e5be15937f0f292992 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 4 Sep 2025 12:18:30 +0200 Subject: [PATCH 4/6] refs #2660 remove apparently obsolete package --- mkoglive.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkoglive.cfg b/mkoglive.cfg index 68c8b51..1965fd1 100644 --- a/mkoglive.cfg +++ b/mkoglive.cfg @@ -116,4 +116,4 @@ ogagent = stunnel4 filebeat ogbrowser = sway libinput-tools hwdata ogbrowser -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 +oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip python3-hivex opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm From b6dd357431674e7ec766673aef98bc8c70b7630f Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 4 Sep 2025 13:21:29 +0200 Subject: [PATCH 5/6] refs #2660 add missing package --- mkoglive.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkoglive.cfg b/mkoglive.cfg index 1965fd1..47f1518 100644 --- a/mkoglive.cfg +++ b/mkoglive.cfg @@ -112,7 +112,7 @@ xwindows = #roxterm gparted #+80M #openbox midori #xvesa en compilacion -ogagent = stunnel4 filebeat +ogagent = stunnel4 filebeat ogagent ogbrowser = sway libinput-tools hwdata ogbrowser From e81b92a341b5a3d395958e06becc382e6d4abe0e Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Mon, 15 Sep 2025 10:42:26 +0200 Subject: [PATCH 6/6] refs #2660 bump oglive version --- includes/etc/initramfs-tools/scripts/VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/etc/initramfs-tools/scripts/VERSION.txt b/includes/etc/initramfs-tools/scripts/VERSION.txt index 8403286..484d442 100644 --- a/includes/etc/initramfs-tools/scripts/VERSION.txt +++ b/includes/etc/initramfs-tools/scripts/VERSION.txt @@ -1 +1 @@ -OpenGnsys Client 3.13.0 +OpenGnsys Client 3.14.0