Merge branch 'test' into develop

2022-11-22 00:38:04 +01:00
parent e6b5cb134a fa62e15c05
commit ef24b302cd
23 changed files with 90 additions and 48 deletions
--- a/config/binary
+++ b/config/binary
@@ -41,7 +41,11 @@ LB_BUILD_WITH_CHROOT="true"
 LB_DEBIAN_INSTALLER="live"

 # Set debian-installer suite
+<<<<<<< HEAD
 LB_DEBIAN_INSTALLER_DISTRIBUTION="buster"
+=======
+LB_DEBIAN_INSTALLER_DISTRIBUTION="bullseye"
+>>>>>>> test

 # Set debian-installer preseed filename/url
 LB_DEBIAN_INSTALLER_PRESEEDFILE=""
@@ -59,7 +63,11 @@ LB_HDD_SIZE="auto"
 LB_HDD_PARTITION_START=""

 # Set iso author
+<<<<<<< HEAD
 LB_ISO_APPLICATION="SVPRO_GNU"
+=======
+LB_ISO_APPLICATION="SVPROGNU-11"
+>>>>>>> test

 # Set iso preparer
 LB_ISO_PREPARER="live-build @LB_VERSION@; https://salsa.debian.org/live-team/live-build"
@@ -68,7 +76,11 @@ 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)
+<<<<<<< HEAD
 LB_ISO_VOLUME="SVPRO_GNU"
+=======
+LB_ISO_VOLUME="SVPROGNU-11"
+>>>>>>> test

 # Set jffs2 eraseblock size
 LB_JFFS2_ERASEBLOCK=""
--- a/config/bootloaders/extlinux/splash.png
+++ b/config/bootloaders/extlinux/splash.png
--- a/config/bootloaders/grub-legacy/splash.png
+++ b/config/bootloaders/grub-legacy/splash.png
--- a/config/bootloaders/grub-pc/grub.cfg
+++ b/config/bootloaders/grub-pc/grub.cfg
@@ -24,8 +24,8 @@ fi

 terminal_output gfxterm

-insmod play
-play 960 440 1 0 4 440 1
+#insmod play
+#play 960 440 1 0 4 440 1

 # Live boot
 LINUX_LIVE
--- a/config/bootloaders/grub-pc/splash.png
+++ b/config/bootloaders/grub-pc/splash.png
--- a/config/bootloaders/isolinux/splash.png
+++ b/config/bootloaders/isolinux/splash.png
--- a/config/bootloaders/pxelinux/splash.png
+++ b/config/bootloaders/pxelinux/splash.png
--- a/config/bootloaders/syslinux/splash.png
+++ b/config/bootloaders/syslinux/splash.png
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -2,6 +2,7 @@

 # Select architecture to use
 LB_ARCHITECTURE="amd64"
+<<<<<<< HEAD

 # Select distribution to use
 LB_DISTRIBUTION="buster"
@@ -24,6 +25,30 @@ LB_PARENT_DISTRIBUTION_BINARY="buster"
 # Select parent distribution for debian-installer to use
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="buster"

+=======
+
+# Select distribution to use
+LB_DISTRIBUTION="bullseye"
+
+# Select parent distribution to use
+LB_PARENT_DISTRIBUTION=""
+
+# Select distribution to use in the chroot
+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"
+
+>>>>>>> test
 # Select archive areas to use
 LB_ARCHIVE_AREAS="main contrib non-free"

--- a/config/hooks/live/0200-seafile.hook.chroot
+++ b/config/hooks/live/0200-seafile.hook.chroot
@@ -1,7 +1,7 @@
 #!/bin/bash

 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/buster/ 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/bullseye/ stable main' > /etc/apt/sources.list.d/seafile.list

 apt update
 apt install -y seafile-gui
--- a/config/includes.chroot/etc/issue
+++ b/config/includes.chroot/etc/issue
@@ -6,4 +6,4 @@
                              |_____|                

 \r \v \n
-Bienvenu !
+Bullseye !
--- a/config/includes.chroot/etc/motd
+++ b/config/includes.chroot/etc/motd
@@ -5,5 +5,6 @@
 |____/  \_/  |_|   |_| \_\\___/___\____|_| \_|\___/ 
                              |_____|                

-Bienvenu !
+Bullseye !
+

--- a/config/includes.chroot/etc/os-release
+++ b/config/includes.chroot/etc/os-release
@@ -1,7 +1,7 @@
-PRETTY_NAME="Debian SVPRO_GNU"
-NAME="SVPRO_GNU"
+PRETTY_NAME="Debian SVPROGNU Bullseye"
+NAME="SVPROGNU"
 ID=svprognu
-VERSION="1.0"
-VERSION_ID=1.0
-HOME_URL="https://git.weblib.re/svpro/svpro_gnu/wiki"
+VERSION="11"
+VERSION_ID=11
+HOME_URL="https://www.weblib.re/dokuwiki/svpro_gnu"
 SUPPORT_URL="https://git.weblib.re/svpro/svpro_gnu/"
--- a/config/includes.chroot/usr/local/bin/grub_boot_splash
+++ b/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

--- a/config/includes.chroot/usr/share/images/desktop-base/default
+++ b/config/includes.chroot/usr/share/images/desktop-base/default
--- a/config/includes.chroot/usr/share/plymouth/themes/svpro_gnu/svprognu-grub.png
+++ b/config/includes.chroot/usr/share/plymouth/themes/svpro_gnu/svprognu-grub.png
--- a/config/includes.chroot/usr/share/plymouth/themes/svpro_gnu/svprognu-splash.png
+++ b/config/includes.chroot/usr/share/plymouth/themes/svpro_gnu/svprognu-splash.png
--- a/config/includes.installer/usr/share/graphics/logo_debian.png
+++ b/config/includes.installer/usr/share/graphics/logo_debian.png
--- a/config/package-lists/live.list.chroot
+++ b/config/package-lists/live.list.chroot
@@ -62,7 +62,6 @@ chromium-l10n

 # Education
 gcompris
-childsplay

 # Virtualisation
 spice-vdagent