up bookworm

README.md

@@ -6,14 +6,17 @@ Système d'exploitation x64 - 100% GNU basé sur Debian 11 (Bullseye)
 ## Installation (root)
 ### Créer clef usb + persistence
 **Attention ! La clef ne doit pas être montée par un autre processus (explorateur de fichiers, utilitaire d'auto-mount...)
-
+* Cloner le dépot
+```
+git clone https://git.vermeulen.pro/SVPRO/svprognu.git && cd svprognu
+```
 * Si vous avez déjà téléchatgé l'image ISO, dans le même répertoire :
 ```
-curl https://git.vermeulen.pro/SVPRO/svprognu/raw/branch/develop/build_svprognu | bash -s -- -d /dev/sdX
+./build_svprognu -d /dev/sdX # sdX étant la cible physique de la clé
 ```
 * Ou récupérer l'image depuis le serveur :
 ```
-curl https://git.vermeulen.pro/SVPRO/svprognu/raw/branch/develop/build_svprognu | bash -s -- -r -d /dev/sdX
+./build_svprognu -r -d /dev/sdX # sdX étant la cible physique de la clé
 ```
 **La persistence sera configurée lors du 1er boot. Le démarrage peut prendre quelques minutes.
 

auto/config

@@ -4,9 +4,9 @@ set -e
 
 lb config noauto \
         --bootloaders "syslinux,grub-efi" \
-        --distribution "bullseye" \
+        --distribution "bookworm" \
         --architectures "amd64" \
-        --archive-areas "main contrib non-free" \
+        --archive-areas "main contrib non-free non-free-firmware" \
         --apt-recommends "true" \
         --debian-installer-gui "true" \
         --debian-installer "live" \
@@ -16,8 +16,8 @@ lb config noauto \
 	--uefi-secure-boot "enable" \
         --linux-flavours "amd64" \
 	--linux-packages "linux-image linux-headers" \
-	--iso-volume "SVPROGNU-11" \
-	--iso-application "SVPROGNU-11" \
+	--iso-volume "SVPROGNU-12" \
+	--iso-application "SVPROGNU-12" \
         --backports "false" \
         --updates "true" \
 	--security "true" \

build_svprognu

@@ -5,7 +5,7 @@
 
 set -e
 
-ISO="live-svprognu-bullseye_amd64.iso"
+ISO="live-svprognu-bookworm_amd64.iso"
 
 
 while getopts ":r d:" opt; do

config/binary

@@ -16,7 +16,7 @@ LB_BOOTAPPEND_LIVE="lang=fr_FR.UTF-8 locales=fr_FR.UTF-8 keyboard-layouts=fr spl
 LB_BOOTAPPEND_INSTALL="locales=fr_FR.UTF-8"
 
 # Set boot parameters
-LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788"
+LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788"
 
 # Set BIOS bootloader
 LB_BOOTLOADER_BIOS="syslinux"
@@ -24,12 +24,24 @@ LB_BOOTLOADER_BIOS="syslinux"
 # Set EFI bootloader
 LB_BOOTLOADER_EFI="grub-efi"
 
+# Set bootloaders
+LB_BOOTLOADERS="syslinux grub-efi"
+
 # Set checksums
 LB_CHECKSUMS="sha256 md5"
 
 # Set compression
 LB_COMPRESSION="none"
 
+# Support dm-verity on rootfs
+LB_DM_VERITY=""
+
+# Support FEC on dm-verity rootfs
+LB_DM_VERITY_FEC_ROOTS=""
+
+# Set sign script for roothash for dm-verity rootfs
+LB_DM_VERITY_SIGN=""
+
 # Set zsync
 LB_ZSYNC="true"
 
@@ -41,7 +53,7 @@ LB_BUILD_WITH_CHROOT="true"
 LB_DEBIAN_INSTALLER="live"
 
 # Set debian-installer suite
-LB_DEBIAN_INSTALLER_DISTRIBUTION="bullseye"
+LB_DEBIAN_INSTALLER_DISTRIBUTION="bookworm"
 
 # Set debian-installer preseed filename/url
 LB_DEBIAN_INSTALLER_PRESEEDFILE=""
@@ -59,7 +71,7 @@ LB_HDD_SIZE="auto"
 LB_HDD_PARTITION_START=""
 
 # Set iso author
-LB_ISO_APPLICATION="SVPROGNU-11"
+LB_ISO_APPLICATION="SVPROGNU-12"
 
 # Set iso preparer
 LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/live-build"
@@ -68,7 +80,7 @@ LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/liv
 LB_ISO_PUBLISHER="Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org"
 
 # Set iso volume (max 32 chars)
-LB_ISO_VOLUME="SVPROGNU-11"
+LB_ISO_VOLUME="SVPROGNU-12"
 
 # Set jffs2 eraseblock size
 LB_JFFS2_ERASEBLOCK=""
@@ -80,7 +92,7 @@ LB_MEMTEST="none"
 LB_LOADLIN="true"
 
 # Set win32-loader
-LB_WIN32_LOADER="true"
+LB_WIN32_LOADER="false"
 
 # Set net tarball
 LB_NET_TARBALL="true"

config/bootstrap

@@ -4,31 +4,31 @@
 LB_ARCHITECTURE="amd64"
 
 # Select distribution to use
-LB_DISTRIBUTION="bullseye"
+LB_DISTRIBUTION="bookworm"
 
 # Select parent distribution to use
 LB_PARENT_DISTRIBUTION=""
 
 # Select distribution to use in the chroot
-LB_DISTRIBUTION_CHROOT="bullseye"
+LB_DISTRIBUTION_CHROOT="bookworm"
 
 # Select parent distribution to use in the chroot
-LB_PARENT_DISTRIBUTION_CHROOT="bullseye"
+LB_PARENT_DISTRIBUTION_CHROOT="bookworm"
 
 # Select distribution to use in the final image
-LB_DISTRIBUTION_BINARY="bullseye"
+LB_DISTRIBUTION_BINARY="bookworm"
 
 # Select parent distribution to use in the final image
-LB_PARENT_DISTRIBUTION_BINARY="bullseye"
+LB_PARENT_DISTRIBUTION_BINARY="bookworm"
 
 # Select parent distribution for debian-installer to use
-LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bullseye"
+LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bookworm"
 
 # Select archive areas to use
-LB_ARCHIVE_AREAS="main contrib non-free"
+LB_ARCHIVE_AREAS="main contrib non-free non-free-firmware"
 
 # Select parent archive areas to use
-LB_PARENT_ARCHIVE_AREAS="main contrib non-free"
+LB_PARENT_ARCHIVE_AREAS="main contrib non-free non-free-firmware"
 
 # Set parent mirror to bootstrap from
 LB_PARENT_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/"

config/common

@@ -1,15 +1,12 @@
 # config/common - common options for live-build(7)
 
 # Version of live-build used to build config (config format version)
-LB_CONFIGURATION_VERSION="20210407"
+LB_CONFIGURATION_VERSION="20230502"
 
 # Set package manager
 LB_APT="apt"
 
-# Set apt/aptitude/debootstrap ftp proxy
-LB_APT_FTP_PROXY=""
-
-# Set apt/aptitude/debootstrap http proxy
+# Set proxy for HTTP connections
 LB_APT_HTTP_PROXY=""
 
 # Set apt/aptitude pipeline depth

config/hooks/live/0200-seafile.hook.chroot

@@ -3,7 +3,7 @@
 set -e
 
 wget https://linux-clients.seafile.com/seafile.asc -O /usr/share/keyrings/seafile-keyring.asc
-echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/seafile-keyring.asc] https://linux-clients.seafile.com/seafile-deb/bullseye/ stable main' > /etc/apt/sources.list.d/seafile.list
+echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/seafile-keyring.asc] https://linux-clients.seafile.com/seafile-deb/bookworm/ stable main' > /etc/apt/sources.list.d/seafile.list
 
 apt update
 apt install -y seafile-gui

config/hooks/live/0600-balena-etcher.hook

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+GIT="https://github.com/balena-io/etcher"
+VERSION=$(git -c 'versionsort.suffix=-' \
+    ls-remote --exit-code --refs --sort='version:refname' --tags ${GIT} '*.*.*' \
+    | tail --lines=1 \
+    | cut --delimiter='/' --fields=3 \
+	 | sed -e 's/v//g') #Get latest version number without "v"
+
+wget ${GIT}/releases/download/v${VERSION}/balena-etcher_${VERSION}_amd64.deb
+dpkg -i balena-etcher_${VERSION}_amd64.deb
+apt install -fy
+
+exit 0

config/hooks/live/0700-mattermost-desktop.hook

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+wget https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop_5.5.1-1_amd64.deb
+dpkg -i mattermost-desktop_5.5.1-1_amd64.deb
+apt install -fy
+
+exit 0

config/includes.chroot/etc/issue

@@ -1,9 +1,9 @@
-  ______     ______  ____   ___     ____ _   _ _   _ 
- / ___\ \   / /  _ \|  _ \ / _ \   / ___| \ | | | | |
- \___ \\ \ / /| |_) | |_) | | | | | |  _|  \| | | | |
-  ___) |\ V / |  __/|  _ <| |_| | | |_| | |\  | |_| |
- |____/  \_/  |_|   |_| \_\\___/___\____|_| \_|\___/ 
-                              |_____|                
+  ______     ______  ____   ___    ____ _   _ _   _ 
+ / ___\ \   / /  _ \|  _ \ / _ \  / ___| \ | | | | |
+ \___ \\ \ / /| |_) | |_) | | | || |  _|  \| | | | |
+  ___) |\ V / |  __/|  _ <| |_| || |_| | |\  | |_| |
+ |____/  \_/  |_|   |_| \_\\___/  \____|_| \_|\____/ 
+                
 
 \r \v \n
-Bullseye !
+Bookworm !

config/includes.chroot/etc/motd

@@ -1,10 +1,9 @@
-  ______     ______  ____   ___     ____ _   _ _   _ 
- / ___\ \   / /  _ \|  _ \ / _ \   / ___| \ | | | | |
- \___ \\ \ / /| |_) | |_) | | | | | |  _|  \| | | | |
-  ___) |\ V / |  __/|  _ <| |_| | | |_| | |\  | |_| |
- |____/  \_/  |_|   |_| \_\\___/___\____|_| \_|\___/ 
-                              |_____|                
-
-Bullseye !
-
+  ______     ______  ____   ___    ____ _   _ _   _ 
+ / ___\ \   / /  _ \|  _ \ / _ \  / ___| \ | | | | |
+ \___ \\ \ / /| |_) | |_) | | | || |  _|  \| | | | |
+  ___) |\ V / |  __/|  _ <| |_| || |_| | |\  | |_| |
+ |____/  \_/  |_|   |_| \_\\___/  \____|_| \_|\____/ 
+                
 
+\r \v \n
+Bookworm !

config/includes.chroot/etc/os-release

@@ -1,7 +1,7 @@
-PRETTY_NAME="Debian SVPROGNU Bullseye"
-NAME="SVPROGNU"
-ID=svprognu
-VERSION="11"
-VERSION_ID=11
-HOME_URL="https://www.weblib.re/dokuwiki/svprognu"
-SUPPORT_URL="https://git.weblib.re/svpro/svprognu/"
+PRETTY_NAME="Debian SVPROGNU Bookworm"
+NAME="SVPROGNU Bookworm"
+ID=svprognu_bookworm
+VERSION="12"
+VERSION_ID=12
+HOME_URL="https://svprognu.vermeulen.pro"
+SUPPORT_URL="https://git.vermeulen.pro/SVPRO/svprognu"

config/package-lists/live.list.chroot

@@ -4,8 +4,7 @@ live-config
 live-config-systemd
 
 # System
-firmware-linux
-firmware-b43-installer
+firmware-linux-nonfree
 task-french-desktop
 task-xfce-desktop
 lxde-icon-theme
@@ -34,21 +33,24 @@ bluetooth
 blueman
 samba
 screen
+ntp
 
 # Graphiques
 scribus
 inkscape
 gimp
 flameshot
+ksnip
 
 # Multimedia
 vlc
 simplescreenrecorder
-openshot
+openshot-qt
 audacity
 kodi
 obs-studio
 brasero
+vokoscreen-ng
 
 # Utilitaires
 qtpass
@@ -61,7 +63,6 @@ filezilla
 # Internet
 pidgin
 remmina
-remmina-plugin-spice
 remmina-plugin-vnc
 firefox-esr
 firefox-esr-l10n-fr
@@ -71,7 +72,7 @@ chromium
 chromium-l10n
 
 # Education
-gcompris
+gcompris-qt
 
 # Virtualisation
 spice-vdagent