fix

Reviewed-on: #19

README.md

@@ -1,16 +1,19 @@
-# svpro_gnu
+# SVPROGNU
+
+Système d'exploitation x64 - 100% GNU basé sur Debian 11 (Bullseye)
 
-Système d'exploitation x64 - 100% GNU basé sur Debian
 
 ## Installation (root)
-### Générer ISO seule
-```
-curl https://git.weblib.re/svpro/svpro_gnu/raw/branch/develop/build_svprognu | bash
-```
 ### 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...)
+
+* Si vous avez déjà téléchatgé l'image ISO, dans le même répertoire :
 ```
-curl https://git.weblib.re/svpro/svpro_gnu/raw/branch/develop/build_svprognu | bash -s -- -d /dev/sdX
+curl https://git.vermeulen.pro/SVPRO/svprognu/raw/branch/develop/build_svprognu | bash -s -- -d /dev/sdX
+```
+* 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
 ```
 **La persistence sera configurée lors du 1er boot. Le démarrage peut prendre quelques minutes.
 
@@ -19,7 +22,7 @@ Depuis le menu du live, choisir "Installation Graphique ou Experts"
 
 
 
-## Build iso avec live-build (expoerts)
+## Build iso avec live-build (experts)
 Cloner le dépôt puis :
 ```
 apt install live-build
@@ -28,13 +31,5 @@ lb config
 lb build
 ```
 
-### Démo (Session Live via noVNC)
+### WIKI
-En ligne uniquement en journée
+https://svprognu.vermeulen.pro/
-https://svprognu.weblib.re/
-
-
-### ToDo
-
-- [x] Installeur
-- [x] Live Persistence
-- [ ] Integration Yunohost

auto/config

@@ -4,7 +4,7 @@ set -e
 
 lb config noauto \
         --bootloaders "syslinux,grub-efi" \
-        --distribution "buster" \
+        --distribution "bullseye" \
         --architectures "amd64" \
         --archive-areas "main contrib non-free" \
         --apt-recommends "true" \
@@ -16,8 +16,9 @@ lb config noauto \
 	--uefi-secure-boot "enable" \
         --linux-flavours "amd64" \
 	--linux-packages "linux-image linux-headers" \
-	--iso-volume "SVPRO_GNU" \
+	--iso-volume "SVPROGNU-11" \
-	--iso-application "SVPRO_GNU" \
+	--iso-application "SVPROGNU-11" \
         --backports "false" \
         --updates "true" \
+	--security "true" \
         "${@}"

build_svprognu

@@ -1,31 +1,46 @@
 #!/bin/bash
 
 # Creation de la clef ./build_svprognu -d /dev/sdX
-# Creation de l'iso seule ./build_svprognu
+
 
 set -e
 
-ISO="live-svpro_gnu-amd64.iso"
+ISO="live-svprognu-bullseye_amd64.iso"
 
-# Recuperation iso
-echo "Téléchargement de l'iso..."
-sleep 5
-wget -O ${ISO} https://www.weblib.re/dokuwiki/_media/svpro_gnu:live_svpro_gnu-amd64.hybrid.iso
-wget -O ${ISO}.md5sum https://www.weblib.re/dokuwiki/_media/svpro_gnu:live_svpro_gnu-amd64.hybrid.iso.md5sum
-echo "Vérification de l'image..."
 
-if ! md5sum -c ${ISO}.md5sum
+while getopts ":r d:" opt; do
-	then
+case $opt in
-	echo "ISO Corompue. Abandon !!"
+   	r)
-	rm -f ${ISO} ${ISO}.md5
+	# Recuperation iso
-	exit 1
+	echo "Téléchargement de l'iso..."
-fi
+	sleep 5
+	wget -O ${ISO} https://dl.vermeulen.pro/SVPROGNU/${ISO}
+	wget -O ${ISO}.md5sum https://dl.vermeulen.pro/SVPROGNU/${ISO}.md5sum
+	echo "Vérification de l'image..."
+
+	if ! md5sum -c ${ISO}.md5sum
+		then
+		echo "ISO Corompue. Abandon !!"
+		rm -f ${ISO} ${ISO}.md5
+		exit 1
+	fi
+	;;
 
 # Copie de l'image iso sur clé
-while getopts ":d: " opt; do
+
-case $opt in
+   	d)
-   d)
 	echo "Transfert en cours..."
+
+	#Vérification montage support
+	if mount | grep -q $OPTARG > /dev/null
+        	then
+        	umount $OPTARG* || /bin/true
+	fi
+
+	#Réinitialisation de la clé : Table DOS
+	printf 'o\nw' | fdisk $OPTARG
+
+	#Transfert
 	dd if=${ISO} of=$OPTARG bs=4M status=progress
 	sync
 
@@ -33,6 +48,8 @@ case $opt in
 	echo "Création de la persistence..."
 	sleep 5
 	printf 'n\np\n\n\n\nw' | fdisk $OPTARG
+	echo "Formatage..."
+	sleep 10
 	mkfs.ext4 -L persistence ${OPTARG}3
 
 	# Configuratio de la partition
@@ -40,6 +57,9 @@ case $opt in
 	mount ${OPTARG}3 ./tmp
 	echo "/ union" > ./tmp/persistence.conf
 	umount ./tmp
+	echo "Finalisation..."
+	sleep 10
+	rm -rf ./tmp
 
 	# Fin
 	echo "Terminé ! Vous pouvez booter sur la clé USB, la persistence sera auto-configurée lors du premier Boot !"

config/binary

@@ -1,170 +1,107 @@
 # config/binary - options for live-build(7), binary stage
 
-# $LB_BINARY_FILESYSTEM: set image filesystem
+# Set image type
-# (Default: fat32)
+LB_IMAGE_TYPE="iso-hybrid"
+
+# Set image filesystem
 LB_BINARY_FILESYSTEM="fat32"
 
-# $LB_APT_INDICES: set apt/aptitude generic indices
+# Set apt/aptitude generic indices
-# (Default: true)
 LB_APT_INDICES="true"
 
-# $LB_BOOTAPPEND_LIVE: set boot parameters
+# Set boot parameters
-# (Default: empty)
 LB_BOOTAPPEND_LIVE="lang=fr_FR.UTF-8 locales=fr_FR.UTF-8 keyboard-layouts=fr splash timezone=Europe/Paris utc=yes keyboard-model=pc105 hostname=svprognu boot=live persistence components username=svpro_gnu"
 
-# $LB_BOOTAPPEND_INSTALL: set boot parameters
+# Set boot parameters
-# (Default: empty)
 LB_BOOTAPPEND_INSTALL="locales=fr_FR.UTF-8"
 
-# $LB_BOOTAPPEND_LIVE_FAILSAFE: set boot parameters
+# Set boot parameters
-# (Default: empty)
+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 nomodeset nosmp nosplash vga=normal"
 
-# $LB_BOOTLOADERS: set bootloaders
+# Set BIOS bootloader
-# (Default: syslinux,grub-efi)
+LB_BOOTLOADER_BIOS="syslinux"
-LB_BOOTLOADERS="syslinux,grub-efi"
 
-# $LB_CHECKSUMS: set checksums
+# Set EFI bootloader
-# (Default: md5)
+LB_BOOTLOADER_EFI="grub-efi"
-LB_CHECKSUMS="md5"
 
-# $LB_COMPRESSION: set compression
+# Set checksums
-# (Default: none)
+LB_CHECKSUMS="sha256 md5"
+
+# Set compression
 LB_COMPRESSION="none"
 
-# $LB_ZSYNC: set zsync
+# Set zsync
-# (Default: true)
 LB_ZSYNC="true"
 
-# ${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted
+# Control if we build binary images chrooted
-# (Default: true)
+# NEVER, *EVER*, *E*V*E*R* SET THIS OPTION to false.
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
 LB_BUILD_WITH_CHROOT="true"
 
-# $LB_DEBIAN_INSTALLER: set debian-installer
+# Set debian-installer
-# (Default: live)
 LB_DEBIAN_INSTALLER="live"
 
-# $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
+# Set debian-installer suite
-# (Default: empty)
+LB_DEBIAN_INSTALLER_DISTRIBUTION="bullseye"
-LB_DEBIAN_INSTALLER_DISTRIBUTION="buster"
 
-# $LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
+# Set debian-installer preseed filename/url
-# (Default: )
 LB_DEBIAN_INSTALLER_PRESEEDFILE=""
 
-# $LB_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer
+# Toggle use of GUI debian-installer
-# (Default: true)
 LB_DEBIAN_INSTALLER_GUI="true"
 
-# $LB_GRUB_SPLASH: set custom grub splash
+# Set hdd label
-# (Default: empty)
-LB_GRUB_SPLASH=""
-
-# $LB_HDD_LABEL: set hdd label
-# (Default: DEBIAN_LIVE)
 LB_HDD_LABEL="DEBIAN_LIVE"
 
-# $LB_HDD_SIZE: set hdd filesystem size
+# Set hdd filesystem size
-# (Default: auto)
 LB_HDD_SIZE="auto"
 
-# $LB_HDD_PARTITION_START: set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout.
+# Set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout.
-# (Default: )
 LB_HDD_PARTITION_START=""
 
-# $LB_ISO_APPLICATION: set iso author
+# Set iso author
-# (Default: SVPRO_GNU)
+LB_ISO_APPLICATION="SVPROGNU-11"
-LB_ISO_APPLICATION="SVPRO_GNU"
 
-# $LB_ISO_PREPARER: set iso preparer
+# Set iso preparer
-# (Default: live-build 1:20191221; https://salsa.debian.org/live-team/live-build)
+LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/live-build"
-LB_ISO_PREPARER="live-build 1:20191221; https://salsa.debian.org/live-team/live-build"
 
-# $LB_ISO_PUBLISHER: set iso publisher
+# Set iso publisher
-# (Default: Live Systems project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org)
+LB_ISO_PUBLISHER="Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org"
-LB_ISO_PUBLISHER="Live Systems project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org"
 
-# $LB_ISO_VOLUME: set iso volume (max 32 chars)
+# Set iso volume (max 32 chars)
-# (Default: SVPRO_GNU)
+LB_ISO_VOLUME="SVPROGNU-11"
-LB_ISO_VOLUME="SVPRO_GNU"
 
-# $LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
+# Set jffs2 eraseblock size
-# (Default: unset)
 LB_JFFS2_ERASEBLOCK=""
 
-# $LB_MEMTEST: set memtest
+# Set memtest
-# (Default: none)
 LB_MEMTEST="none"
 
-# $LB_LOADLIN: set loadlin
+# Set loadlin
-# (Default: false)
+LB_LOADLIN="true"
-LB_LOADLIN="false"
 
-# $LB_WIN32_LOADER: set win32-loader
+# Set win32-loader
-# (Default: false)
+LB_WIN32_LOADER="true"
-LB_WIN32_LOADER="false"
 
-# $LB_NET_ROOT_FILESYSTEM: set netboot filesystem
+# Set net tarball
-# (Default: nfs)
-LB_NET_ROOT_FILESYSTEM="nfs"
-
-# $LB_NET_ROOT_MOUNTOPTIONS: set nfsopts
-# (Default: empty)
-LB_NET_ROOT_MOUNTOPTIONS=""
-
-# $LB_NET_ROOT_PATH: set netboot server directory
-# (Default: /srv/debian-live)
-LB_NET_ROOT_PATH="/srv/debian-live"
-
-# $LB_NET_ROOT_SERVER: set netboot server address
-# (Default: 192.168.1.1)
-LB_NET_ROOT_SERVER="192.168.1.1"
-
-# $LB_NET_COW_FILESYSTEM: set net client cow filesystem
-# (Default: nfs)
-LB_NET_COW_FILESYSTEM="nfs"
-
-# $LB_NET_COW_MOUNTOPTIONS: set cow mount options
-# (Default: empty)
-LB_NET_COW_MOUNTOPTIONS=""
-
-# $LB_NET_COW_PATH: set cow directory
-# (Default: )
-LB_NET_COW_PATH=""
-
-# $LB_NET_COW_SERVER: set cow server
-# (Default: )
-LB_NET_COW_SERVER=""
-
-# $LB_NET_TARBALL: set net tarball
-# (Default: true)
 LB_NET_TARBALL="true"
 
-# $LB_ONIE: set onie
+# Set onie
-# (Default: false)
 LB_ONIE="false"
 
-# $LB_ONIE_KERNEL_CMDLINE: set onie additional kernel cmdline options
+# Set onie additional kernel cmdline options
-# (Default: )
 LB_ONIE_KERNEL_CMDLINE=""
 
-# $LB_FIRMWARE_BINARY: include firmware packages in debian-installer
+# Set inclusion of firmware packages in debian-installer
-# (Default: true)
 LB_FIRMWARE_BINARY="true"
 
-# $LB_FIRMWARE_CHROOT: include firmware packages in debian-installer
+# Set inclusion of firmware packages in the live image
-# (Default: true)
 LB_FIRMWARE_CHROOT="true"
 
-# $LB_SWAP_FILE_PATH: set swap file path
+# Set swap file path
-# (Default: )
 LB_SWAP_FILE_PATH=""
 
-# $LB_SWAP_FILE_SIZE: set swap file size
+# Set swap file size
-# (Default: 512)
 LB_SWAP_FILE_SIZE="512"
 
-# $LB_UEFI_SECURE_BOOT: enable/disable UEFI secure boot
+# Enable/disable UEFI secure boot support
-# (Default: enable)
 LB_UEFI_SECURE_BOOT="enable"

config/bootloaders/grub-pc/grub.cfg

@@ -24,8 +24,8 @@ fi
 
 terminal_output gfxterm
 
-insmod play
+#insmod play
-play 960 440 1 0 4 440 1
+#play 960 440 1 0 4 440 1
 
 # Live boot
 LINUX_LIVE

config/bootstrap

@@ -1,73 +1,76 @@
 # config/bootstrap - options for live-build(7), bootstrap stage
 
-# $LB_DISTRIBUTION: select distribution to use
+# Select architecture to use
-# (Default: buster)
+LB_ARCHITECTURE="amd64"
-LB_DISTRIBUTION="buster"
 
-# $LB_PARENT_DISTRIBUTION: select parent distribution to use
+# Select distribution to use
-# (Default: buster)
+LB_DISTRIBUTION="bullseye"
-LB_PARENT_DISTRIBUTION="buster"
 
-# $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use
+# Select parent distribution to use
-# (Default: buster)
+LB_PARENT_DISTRIBUTION=""
-LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="buster"
 
-# $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
+# Select distribution to use in the chroot
-# (Default: http://deb.debian.org/debian/)
+LB_DISTRIBUTION_CHROOT="bullseye"
+
+# Select parent distribution to use in the chroot
+LB_PARENT_DISTRIBUTION_CHROOT="bullseye"
+
+# Select distribution to use in the final image
+LB_DISTRIBUTION_BINARY="bullseye"
+
+# Select parent distribution to use in the final image
+LB_PARENT_DISTRIBUTION_BINARY="bullseye"
+
+# Select parent distribution for debian-installer to use
+LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bullseye"
+
+# Select archive areas to use
+LB_ARCHIVE_AREAS="main contrib non-free"
+
+# Select parent archive areas to use
+LB_PARENT_ARCHIVE_AREAS="main contrib non-free"
+
+# Set parent mirror to bootstrap from
 LB_PARENT_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/"
 
-# $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
+# Set parent mirror to fetch packages from
-# (Default: http://deb.debian.org/debian/)
 LB_PARENT_MIRROR_CHROOT="http://deb.debian.org/debian/"
 
-# $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
+# Set security parent mirror to fetch packages from
-# (Default: http://security.debian.org/)
 LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
-# $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image
+# Set parent mirror which ends up in the image
-# (Default: http://deb.debian.org/debian/)
 LB_PARENT_MIRROR_BINARY="http://deb.debian.org/debian/"
 
-# $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image
+# Set security parent mirror which ends up in the image
-# (Default: http://security.debian.org/)
 LB_PARENT_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
+# Set debian-installer parent mirror
-# (Default: http://deb.debian.org/debian/)
 LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/"
 
-# $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
+# Set mirror to bootstrap from
-# (Default: http://deb.debian.org/debian/)
 LB_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/"
 
-# $LB_MIRROR_CHROOT: set mirror to fetch packages from
+# Set mirror to fetch packages from
-# (Default: http://deb.debian.org/debian/)
 LB_MIRROR_CHROOT="http://deb.debian.org/debian/"
 
-# $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
+# Set security mirror to fetch packages from
-# (Default: http://security.debian.org/)
 LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
-# $LB_MIRROR_BINARY: set mirror which ends up in the image
+# Set mirror which ends up in the image
-# (Default: http://deb.debian.org/debian/)
 LB_MIRROR_BINARY="http://deb.debian.org/debian/"
 
-# $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# Set security mirror which ends up in the image
-# (Default: http://security.debian.org/)
 LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
+# Set debian-installer mirror
-# (Default: http://deb.debian.org/debian/)
 LB_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/"
 
-# $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
+# Set architectures to use foreign bootstrap
-# (Default: )
+LB_BOOTSTRAP_QEMU_ARCHITECTURE=""
-LB_BOOTSTRAP_QEMU_ARCHITECTURES=""
 
-# $LB_BOOTSTRAP_QEMU_EXCLUDE: packages to exclude during foreign bootstrap
+# Set packages to exclude during foreign bootstrap
-# (Default: )
 LB_BOOTSTRAP_QEMU_EXCLUDE=""
 
-# $LB_BOOTSTRAP_QEMU_STATIC: static qemu binary for foreign bootstrap
+# Set static qemu binary for foreign bootstrap
-# (Default: )
 LB_BOOTSTRAP_QEMU_STATIC=""

config/build

@@ -1,10 +0,0 @@
-[Image]
-Architecture: amd64
-Archive-Areas: main contrib non-free
-Distribution: buster
-Mirror-Bootstrap: http://deb.debian.org/debian/
-
-[FIXME]
-Configuration-Version: 1:20191221
-Name: live_svpro_gnu
-Type: iso-hybrid

config/chroot

@@ -1,37 +1,34 @@
 # config/chroot - options for live-build(7), chroot stage
 
-# $LB_CHROOT_FILESYSTEM: set chroot filesystem
+# Set chroot filesystem
-# (Default: squashfs)
 LB_CHROOT_FILESYSTEM="squashfs"
 
-# $LB_UNION_FILESYSTEM: set union filesystem
+# Set chroot squashfs compression level
-# (Default: overlay)
+LB_CHROOT_SQUASHFS_COMPRESSION_LEVEL=""
+
+# Set chroot squashfs compression type
+LB_CHROOT_SQUASHFS_COMPRESSION_TYPE=""
+
+# Set union filesystem
 LB_UNION_FILESYSTEM="overlay"
 
-# $LB_INTERACTIVE: set interactive build
+# Set interactive build
-# (Default: false)
 LB_INTERACTIVE="false"
 
-# $LB_KEYRING_PACKAGES: set keyring packages
+# Set keyring packages
-# (Default: empty)
 LB_KEYRING_PACKAGES="debian-archive-keyring"
 
-# $LB_LINUX_FLAVOURS: set kernel flavour to use
+# Set kernel flavour to use (with arch)
-# (Default: autodetected)
+LB_LINUX_FLAVOURS_WITH_ARCH="amd64"
-LB_LINUX_FLAVOURS="amd64"
 
-# $LB_LINUX_PACKAGES: set kernel packages to use
+# Set kernel packages to use
-# (Default: autodetected)
 LB_LINUX_PACKAGES="linux-image linux-headers"
 
-# $LB_SECURITY: enable security updates
+# Enable security updates
-# (Default: true)
 LB_SECURITY="true"
 
-# $LB_UPDATES: enable updates updates
+# Enable updates updates
-# (Default: true)
 LB_UPDATES="true"
 
-# $LB_BACKPORTS: enable backports updates
+# Enable backports updates
-# (Default: false)
 LB_BACKPORTS="false"

config/common

@@ -1,119 +1,105 @@
 # config/common - common options for live-build(7)
 
-# $LB_APT: set package manager
+# Version of live-build used to build config (config format version)
-# (Default: apt)
+LB_CONFIGURATION_VERSION="20210407"
+
+# Set package manager
 LB_APT="apt"
 
-# $LB_APT_FTP_PROXY: set apt/aptitude ftp proxy
+# Set apt/aptitude/debootstrap ftp proxy
-# (Default: autodetected or empty)
 LB_APT_FTP_PROXY=""
 
-# $LB_APT_HTTP_PROXY: set apt/aptitude http proxy
+# Set apt/aptitude/debootstrap http proxy
-# (Default: autodetected or empty)
 LB_APT_HTTP_PROXY=""
 
-# $LB_APT_PIPELINE: set apt/aptitude pipeline depth
+# Set apt/aptitude pipeline depth
-# (Default: )
 LB_APT_PIPELINE=""
 
-# $LB_APT_RECOMMENDS: set apt/aptitude recommends
+# Set apt/aptitude recommends
-# (Default: true)
 LB_APT_RECOMMENDS="true"
 
-# $LB_APT_SECURE: set apt/aptitude security
+# Set apt/aptitude security
-# (Default: true)
 LB_APT_SECURE="true"
 
-# $LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list
+# Set apt/aptitude source entries in sources.list
-# (Default: true)
 LB_APT_SOURCE_ARCHIVES="true"
 
-# $LB_CACHE: control cache
+# Control cache
-# (Default: true)
 LB_CACHE="true"
 
-# $LB_CACHE_INDICES: control if downloaded package indices should be cached
+# Control if downloaded package indices should be cached
-# (Default: false)
 LB_CACHE_INDICES="false"
 
-# $LB_CACHE_PACKAGES: control if downloaded packages files should be cached
+# Control if downloaded packages files should be cached
-# (Default: true)
 LB_CACHE_PACKAGES="true"
 
-# $LB_CACHE_STAGES: control if completed stages should be cached
+# Control if completed stages should be cached
-# (Default: bootstrap)
 LB_CACHE_STAGES="bootstrap"
 
-# $LB_DEBCONF_FRONTEND: set debconf(1) frontend to use
+# Set debconf(1) frontend to use
-# (Default: noninteractive)
 LB_DEBCONF_FRONTEND="noninteractive"
 
-# $LB_DEBCONF_PRIORITY: set debconf(1) priority to use
+# Set debconf(1) priority to use
-# (Default: critical)
 LB_DEBCONF_PRIORITY="critical"
 
-# $LB_INITRAMFS: set initramfs hook
+# Set initramfs hook
-# (Default: live-boot)
 LB_INITRAMFS="live-boot"
 
-# $LB_INITRAMFS_COMPRESSION: set initramfs compression
+# Set initramfs compression
-# (Default: gzip)
 LB_INITRAMFS_COMPRESSION="gzip"
 
-# $LB_INITSYSTEM: set init system
+# Set init system
-# (Default: systemd)
 LB_INITSYSTEM="systemd"
 
-# $LB_FDISK: set fdisk program
+# Set distribution mode
-# (Default: autodetected)
-LB_FDISK="fdisk"
-
-# $LB_LOSETUP: set losetup program
-# (Default: autodetected)
-LB_LOSETUP="losetup"
-
-# $LB_MODE: set distribution mode
-# (Default: debian)
 LB_MODE="debian"
 
-# $LB_SYSTEM: set system type
+# Set system type
-# (Default: live)
 LB_SYSTEM="live"
 
-# $LB_TASKSEL: set tasksel program
+# Set base name of the image
-# (Default: apt)
+LB_IMAGE_NAME="live-image"
-LB_TASKSEL="apt"
+
+# Set options to use with apt
+APT_OPTIONS="--yes -o Acquire::Retries=5"
+
+# Set options to use with aptitude
+APTITUDE_OPTIONS="--assume-yes -o Acquire::Retries=5"
+
+# Set options to use with debootstrap
+DEBOOTSTRAP_OPTIONS=""
+
+# Set script to use with debootstrap
+DEBOOTSTRAP_SCRIPT=""
+
+# Set options to use with gzip
+GZIP_OPTIONS="-6 --rsyncable"
+
+# Enable UTC timestamps
+LB_UTC_TIME="false"
 
 # live-build options
 
-# $_BREAKPOINTS: enable breakpoints
+# Enable breakpoints
-# (Default: false)
+# If set here, overrides the command line option
 #_BREAKPOINTS="false"
 
-# $_DEBUG: enable debug
+# Enable debug
-# (Default: false)
+# If set here, overrides the command line option
 #_DEBUG="false"
 
-# $_COLOR: enable color
+# Enable color
-# (Default: false)
+# If set here, overrides the command line option
-#_COLOR="false"
+#_COLOR="auto"
 
-# $_FORCE: enable force
+# Enable force
-# (Default: false)
+# If set here, overrides the command line option
 #_FORCE="false"
 
-# $_QUIET: enable quiet
+# Enable quiet
-# (Default: false)
+# If set here, overrides the command line option
-_QUIET="false"
+#_QUIET="false"
 
-# $_VERBOSE: enable verbose
+# Enable verbose
-# (Default: false)
+# If set here, overrides the command line option
 #_VERBOSE="false"
-
-# Internal stuff (FIXME)
-APT_OPTIONS="--yes"
-APTITUDE_OPTIONS="--assume-yes"
-DEBOOTSTRAP_OPTIONS=""
-DEBOOTSTRAP_SCRIPT=""
-GZIP_OPTIONS="-6  --rsyncable"
-ISOHYBRID_OPTIONS=""

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

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-wget -O - http://linux-clients.seafile.com/seafile.key | apt-key add -
+set -e
-echo 'deb [arch=amd64] http://linux-clients.seafile.com/seafile-deb/buster/ stable main' > /etc/apt/sources.list.d/seafile.list
+
+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
 
 apt update
 apt install -y seafile-gui

config/hooks/live/0300-brave-browser.hook.chroot

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main"|sudo tee /etc/apt/sources.list.d/brave-browser-release.list
+
+apt update
+apt -y install brave-browser
+
+exit 0

config/hooks/live/0400-lightdm-config.hook.chroot

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+mkdir -p /etc/lightdm/lightdm.conf.d
+echo -e "[Seat:*]\ngreeter-hide-users=false" > /etc/lightdm/lightdm.conf.d/010-users-list.conf
+echo -e "[Seat:*]\ngreeter-setup-script=/usr/bin/numlockx on" > /etc/lightdm/lightdm.conf.d/020-numlock-on.conf
+
+exit 0

config/hooks/live/0500-xnviewmp.hook

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+wget https://download.xnview.com/XnViewMP-linux-x64.deb
+dpkg -i XnViewMP-linux-x64.deb
+
+exit 0

config/hooks/normal/0500-reproducible-glibc.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0500-reproducible-glibc.hook.chroot

config/includes.chroot/etc/adduser.conf

@@ -74,7 +74,7 @@ SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)"
 # new users to other groups.
 # This is the list of groups that new non-system users will be added to
 # Default:
-EXTRA_GROUPS="sudo dialout cdrom floppy audio video plugdev users"
+EXTRA_GROUPS="sudo dialout cdrom floppy audio video plugdev users davfs2"
 
 # If ADD_EXTRA_GROUPS is set to something non-zero, the EXTRA_GROUPS
 # option above will be default behavior for adding new, non-system users

config/includes.chroot/etc/issue

@@ -6,4 +6,4 @@
                               |_____|                
 
 \r \v \n
-Bienvenu !
+Bullseye !

config/includes.chroot/etc/motd

@@ -5,5 +5,6 @@
  |____/  \_/  |_|   |_| \_\\___/___\____|_| \_|\___/ 
                               |_____|                
 
-Bienvenu !
+Bullseye !
+
 

config/includes.chroot/etc/os-release

@@ -1,7 +1,7 @@
-PRETTY_NAME="Debian SVPRO_GNU"
+PRETTY_NAME="Debian SVPROGNU Bullseye"
-NAME="SVPRO_GNU"
+NAME="SVPROGNU"
 ID=svprognu
-VERSION="1.0"
+VERSION="11"
-VERSION_ID=1.0
+VERSION_ID=11
-HOME_URL="https://git.weblib.re/svpro/svpro_gnu/wiki"
+HOME_URL="https://www.weblib.re/dokuwiki/svprognu"
-SUPPORT_URL="https://git.weblib.re/svpro/svpro_gnu/"
+SUPPORT_URL="https://git.weblib.re/svpro/svprognu/"

config/includes.chroot/etc/skel/Bureau/firefox-esr.desktop

@@ -0,0 +1,104 @@
+[Desktop Entry]
+Name=Firefox ESR
+Name[bg]=Firefox ESR
+Name[ca]=Firefox ESR
+Name[cs]=Firefox ESR
+Name[el]=Firefox ESR
+Name[es]=Firefox ESR
+Name[fa]=Firefox ESR
+Name[fi]=Firefox ESR
+Name[fr]=Firefox ESR
+Name[hu]=Firefox ESR
+Name[it]=Firefox ESR
+Name[ja]=Firefox ESR
+Name[ko]=Firefox ESR
+Name[nb]=Firefox ESR
+Name[nl]=Firefox ESR
+Name[nn]=Firefox ESR
+Name[no]=Firefox ESR
+Name[pl]=Firefox ESR
+Name[pt]=Firefox ESR
+Name[pt_BR]=Firefox ESR
+Name[ru]=Firefox ESR
+Name[sk]=Firefox ESR
+Name[sv]=Firefox ESR
+Comment=Browse the World Wide Web
+Comment[bg]=Сърфиране в Мрежата
+Comment[ca]=Navegueu per el web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[de]=Im Internet surfen
+Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό
+Comment[es]=Navegue por la web
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Navigue sur Internet
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW 
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[ru]=Обозреватель Всемирной Паутины
+Comment[sk]=Prehliadanie internetu
+Comment[sv]=Surfa på webben
+GenericName=Web Browser
+GenericName[bg]=Интернет браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=Webový prohlížeč
+GenericName[de]=Webbrowser
+GenericName[el]=Περιηγητής ιστού
+GenericName[es]=Navegador web
+GenericName[fa]=مرورگر اینترنتی
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブ・ブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ru]=Интернет-браузер
+GenericName[sk]=Internetový prehliadač
+GenericName[sv]=Webbläsare
+X-GNOME-FullName=Firefox ESR Web Browser
+X-GNOME-FullName[bg]=Интернет браузър (Firefox ESR)
+X-GNOME-FullName[ca]=Navegador web Firefox ESR
+X-GNOME-FullName[cs]=Firefox ESR Webový prohlížeč
+X-GNOME-FullName[el]=Περιηγήτης Ιστού Firefox ESR
+X-GNOME-FullName[es]=Navegador web Firefox ESR
+X-GNOME-FullName[fa]=مرورگر اینترنتی Firefox ESR
+X-GNOME-FullName[fi]=Firefox ESR-selain
+X-GNOME-FullName[fr]=Navigateur Web Firefox ESR
+X-GNOME-FullName[hu]=Firefox ESR webböngésző
+X-GNOME-FullName[it]=Firefox ESR Browser Web
+X-GNOME-FullName[ja]=Firefox ESR ウェブ・ブラウザ
+X-GNOME-FullName[ko]=Firefox ESR 웹 브라우저
+X-GNOME-FullName[nb]=Firefox ESR Nettleser
+X-GNOME-FullName[nl]=Firefox ESR webbrowser
+X-GNOME-FullName[nn]=Firefox ESR Nettlesar
+X-GNOME-FullName[no]=Firefox ESR Nettleser
+X-GNOME-FullName[pl]=Przeglądarka WWW Firefox ESR
+X-GNOME-FullName[pt]=Firefox ESR Navegador Web
+X-GNOME-FullName[pt_BR]=Navegador Web Firefox ESR
+X-GNOME-FullName[ru]=Интернет-браузер Firefox ESR
+X-GNOME-FullName[sk]=Internetový prehliadač Firefox ESR
+X-GNOME-FullName[sv]=Webbläsaren Firefox ESR
+Exec=/usr/lib/firefox-esr/firefox-esr %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=firefox-esr
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
+StartupWMClass=Firefox-esr
+StartupNotify=true

config/includes.chroot/etc/skel/Bureau/thunderbird.desktop

@@ -0,0 +1,115 @@
+[Desktop Entry]
+Name=Thunderbird
+Comment=Read/Write Mail/News with Thunderbird
+GenericName=Mail Client
+Exec=/usr/bin/thunderbird %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Version=1.0
+Icon=/usr/share/thunderbird/chrome/icons/default/default256.png
+Categories=Network;Email;News;GTK;
+MimeType=message/rfc822;x-scheme-handler/mailto;text/calendar;text/x-vcard;
+StartupWMClass=Thunderbird
+StartupNotify=true
+Name[ast]=Veceru de corréu Thunderbird
+Name[ca]=Client de correu Thunderbird
+Name[cs]=Poštovní klient Thunderbird
+Name[da]=Mozilla Thunderbird - e-post/nyhedsgruppe
+Name[de]=Thunderbird E-Mail und Nachrichten
+Name[el]=Ηλεκτρονική αλληλογραφία Thunderbird
+Name[es]=Cliente de correo Thunderbird
+Name[fi]=Thunderbird-sähköposti
+Name[fr]=Messagerie Thunderbird
+Name[gl]=Cliente de correo Thunderbird
+Name[he]=Mozilla Thunderbird דוא״ל/חדשות
+Name[hr]=Mozilla Thunderbird e-pošta/novosti
+Name[hu]=Thunderbird levelezőkliens
+Name[it]=Email Mozilla Thunderbird
+Name[ja]=Thunderbird電子メールクライアント
+Name[ko]=Mozilla Thunderbird
+Name[nl]=Mozilla Thunderbird e-mail/nieuws
+Name[pl]=Klient poczty Thunderbird
+Name[pt_BR]=Cliente de E-mail Thunderbird
+Name[ru]=Почтовый клиент Thunderbird
+Name[sk]=Thunderbird - poštový klient
+Name[sv]=E-postklienten Thunderbird
+Name[ug]=Mozilla Thunderbird ئېلخەت/خەۋەر
+Name[uk]=Поштова програма Thunderbird
+Name[vi]=Trình điện thư Mozilla Thunderbird
+Name[zh_CN]=Thunderbird 邮件/新闻
+Name[zh_TW]=Thunderbird 郵件
+Comment[ast]=Lleer y escribir corréu electrónicu
+Comment[ca]=Llegiu i escriviu correu
+Comment[cs]=Čtení a psaní pošty
+Comment[da]=Læs/skriv post/nyheder med Thunderbird
+Comment[de]=E-Mails und Nachrichten mit Thunderbird lesen und schreiben
+Comment[el]=Διαβάστε και γράψτε γράμματα με το Mozilla Thunderbird
+Comment[es]=Lea y escriba correos y noticias con Thunderbird
+Comment[fi]=Lue ja kirjoita sähköposteja
+Comment[fr]=Lire et écrire des courriels
+Comment[gl]=Lea e escriba correo electrónico
+Comment[he]=קריאה/כתיבה של דוא״ל/חדשות באמצעות Mozilla Thunderbird
+Comment[hr]=Čitajte/šaljite e-poštu s Thunderbird
+Comment[hu]=Levelek írása és olvasása a Thunderbirddel
+Comment[it]=Per leggere e scrivere email
+Comment[ja]=メールの読み書き
+Comment[ko]=Mozilla Thunderbird 메일/뉴스 읽기 및 쓰기 클라이언트
+Comment[nl]=E-mail/nieuws lezen en schrijven met Mozilla Thunderbird
+Comment[pl]=Czytanie i wysyłanie e-maili
+Comment[pt_BR]=Leia e escreva suas mensagens
+Comment[ru]=Читайте и пишите письма
+Comment[sk]=Čítajte a píšte poštu pomocou programu Thunderbird
+Comment[sv]=Läs och skriv e-post
+Comment[ug]=ئېلخەت ۋە خەۋەرلەرنى Mozilla Thunderbird دا كۆرۈش ۋە يېزىش
+Comment[uk]=Читання та написання листів
+Comment[vi]=Đọc và soạn thư điện tử
+Comment[zh_CN]=阅读邮件或新闻
+Comment[zh_TW]=以 Mozilla Thunderbird 讀寫郵件或新聞
+GenericName[ast]=Client de correu
+GenericName[ca]=Client de correu
+GenericName[cs]=Poštovní klient
+GenericName[da]=Postklient
+GenericName[de]=E-Mail-Anwendung
+GenericName[el]=Λογισμικό αλληλογραφίας
+GenericName[es]=Cliente de correo
+GenericName[fi]=Sähköpostiohjelma
+GenericName[fr]=Client de messagerie
+GenericName[gl]=Cliente de correo electrónico
+GenericName[he]=לקוח דוא״ל
+GenericName[hr]=Klijent e-pošte
+GenericName[hu]=Levelezőkliens
+GenericName[it]=Client email
+GenericName[ja]=電子メールクライアント
+GenericName[ko]=메일 클라이언트
+GenericName[nl]=E-mailprogramma
+GenericName[pt_BR]=Cliente de E-mail
+GenericName[ru]=Почтовый клиент
+GenericName[sk]=Poštový klient
+GenericName[ug]=ئېلخەت دېتالى
+GenericName[uk]=Поштова програма
+GenericName[vi]=Phần mềm khách quản lý thư điện tử
+GenericName[zh_CN]=邮件新闻客户端
+GenericName[zh_TW]=郵件用戶端
+Keywords=EMail;E-mail;Contact;Addressbook;News;
+Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS
+Keywords[ca]=Correu;Email;E-mail;Mailing;Llistes;Notícies;RSS
+Keywords[cs]=Email;E-mail;Pošta;Elektronická pošta;Diskusní skupiny;Čtečka;RSS
+Keywords[da]=Email;E-mail;Epost;E-post;Ebrev;E-brev;Kontakt;Adressebog;Nyheder;
+Keywords[de]=Mail;E-Mail;Newsgroup;Nachrichten;Feed;RSS;Post;News;Usenet;online;lesen;schreiben
+Keywords[el]=Email;E-mail;Newsgroup;Feed;RSS;ημαιλ;Αλληλογραφία;Ροή;ΡΣΣ;Συζητήσεις;Γράμματα
+Keywords[es]=Email;Correo electrónico;Noticias;Discusiones;Mensajes;Canales;RSS
+Keywords[fi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;posti;sähköposti;maili;meili;Usenet;uutisryhmät;syöte
+Keywords[fr]=Mails;Mels;E-Mails;Emails;Courriels;Courriers;Newsgroup;Feed;RSS;Poster;Thunderbird;Lire;Écrire
+Keywords[he]=דוא"ל;דוא״ל;מייל;אי-מייל;אימייל;הודעות;מוזילה;תאנדרבירד;ת׳אנדרבירד;ת'אנדרבירד;ת׳אנדרברד;ת'אנדרברד;דואל;
+Keywords[hr]=email;e-mail;e-pošta;pošta;RSS
+Keywords[hu]=Email;E-mail;Levél;Levelezés;Hírcsoport;Feed;Hírforrás;RSS
+Keywords[it]=Email;Mail;Posta;Newsgroup;Feed;RSS
+Keywords[is]=tölvupóstur;rafpóstur;fréttir;fréttahópar;samtöl;skilaboð;fréttastraumar;RSS
+Keywords[ja]=Eメール;イーメール;mail;e-mail;email;メール;電子メール;ニュースグループ;ネットニュース;RSS;フィードリーダー;書く;読む;Mozilla
+Keywords[nl]=Email;E-mail;Newsgroup;Feed;RSS;Nieuwsgroep;Post
+Keywords[ru]=Email;E-mail;Newsgroup;Feed;RSS;почта;письма;новости;фиды
+Keywords[sk]=Email;E-mail;Elektronická pošta;Diskusné skupiny;Čítačka kanálov;RSS
+Keywords[uk]=Email;E-mail;Newsgroup;Feed;RSS;пошта;новини;подачі;стрічка
+Keywords[vi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;Thư điện tử;Gửi thư
+Keywords[zh_CN]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;电子;邮件;新闻;Thunderbird;tb;雷鸟;电邮;邮箱;阅读器;

config/includes.chroot/usr/local/bin/grub_boot_splash

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "GRUB_BACKGROUND=\"/usr/share/plymouth/themes/svpro_gnu/svprognu-splash.png\"" >> /etc/default/grub
+echo "GRUB_BACKGROUND=\"/usr/share/plymouth/themes/svpro_gnu/svprognu-grub.png\"" >> /etc/default/grub
 echo "GRUB_CMDLINE_LINUX_DEFAULT=\"quiet splash\"" >> /etc/default/grub
 update-grub
 

config/package-lists/live.list.chroot

@@ -9,6 +9,7 @@ firmware-b43-installer
 task-french-desktop
 task-xfce-desktop
 lxde-icon-theme
+sddm
 fonts-cantarell
 bluebird-gtk-theme
 terminator
@@ -19,6 +20,7 @@ curl
 git
 sshfs
 wget
+rsync
 net-tools
 davfs2
 xtightvncviewer
@@ -26,6 +28,12 @@ gparted
 dkms
 python3-pip
 cups
+numlockx
+gnupg2
+bluetooth
+blueman
+samba
+screen
 
 # Graphiques
 scribus
@@ -40,11 +48,15 @@ openshot
 audacity
 kodi
 obs-studio
+brasero
 
 # Utilitaires
 qtpass
 nextcloud-desktop
 nautilus-nextcloud
+galculator
+snapd
+filezilla
 
 # Internet
 pidgin
@@ -60,7 +72,6 @@ chromium-l10n
 
 # Education
 gcompris
-childsplay
 
 # Virtualisation
 spice-vdagent

config/source

@@ -1,9 +1,7 @@
 # config/source - options for live-build(7), source stage
 
-# $LB_SOURCE: set source option
+# Set source option
-# (Default: false)
 LB_SOURCE="false"
 
-# $LB_SOURCE_IMAGES: set image type
+# Set image type
-# (Default: tar)
 LB_SOURCE_IMAGES="tar"