diff --git a/README.md b/README.md index faf046a..ce6a9e5 100644 --- a/README.md +++ b/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.weblib.re/svpro/svprognu/raw/branch/develop/build_svprognu | bash -s -- -d /dev/sdX +``` +* Ou récupérer l'image depuis le serveur : +``` +curl https://git.weblib.re/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 @@ -31,10 +34,3 @@ lb build ### Démo (Session Live via noVNC) En ligne uniquement en journée https://svprognu.weblib.re/ - - -### ToDo - -- [x] Installeur -- [x] Live Persistence -- [ ] Integration Yunohost diff --git a/Screenshot.png b/Screenshot.png deleted file mode 100644 index 09d6183..0000000 Binary files a/Screenshot.png and /dev/null differ diff --git a/auto/config b/auto/config index c73c99f..fc0c3e0 100755 --- a/auto/config +++ b/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-application "SVPRO_GNU" \ + --iso-volume "SVPROGNU-11" \ + --iso-application "SVPROGNU-11" \ --backports "false" \ --updates "true" \ + --security "true" \ "${@}" diff --git a/build_svprognu b/build_svprognu index 342406c..69d1801 100755 --- a/build_svprognu +++ b/build_svprognu @@ -1,37 +1,45 @@ #!/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.hybrid.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 - then - echo "ISO Corompue. Abandon !!" - rm -f ${ISO} ${ISO}.md5 - exit 1 -fi +while getopts ":r d:" opt; do +case $opt in + r) + # Recuperation iso + echo "Téléchargement de l'iso..." + sleep 5 + wget -O ${ISO} https://www.weblib.re/dokuwiki/_media/svprognu:${ISO} + wget -O ${ISO}.md5sum https://www.weblib.re/dokuwiki/_media/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..." + #Réinitialisation de la clé : Table DOS + printf 'o\nw' | fdisk $OPTARG + + #Transfert dd if=${ISO} of=$OPTARG bs=4M status=progress sync # Création de la partition dédiée à la persistence echo "Création de la persistence..." - sleep 10 + sleep 5 printf 'n\np\n\n\n\nw' | fdisk $OPTARG echo "Formatage..." sleep 10 diff --git a/config/binary b/config/binary index 496dc1b..66a7ad8 100644 --- 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="" diff --git a/config/bootloaders/extlinux/splash.png b/config/bootloaders/extlinux/splash.png index 8d6a1d3..a2d1094 100644 Binary files a/config/bootloaders/extlinux/splash.png and b/config/bootloaders/extlinux/splash.png differ diff --git a/config/bootloaders/grub-legacy/splash.png b/config/bootloaders/grub-legacy/splash.png index 8d6a1d3..a2d1094 100644 Binary files a/config/bootloaders/grub-legacy/splash.png and b/config/bootloaders/grub-legacy/splash.png differ diff --git a/config/bootloaders/grub-pc/grub.cfg b/config/bootloaders/grub-pc/grub.cfg index 7a94bdc..c859b7e 100644 --- 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 diff --git a/config/bootloaders/grub-pc/splash.png b/config/bootloaders/grub-pc/splash.png index 8d6a1d3..a2d1094 100644 Binary files a/config/bootloaders/grub-pc/splash.png and b/config/bootloaders/grub-pc/splash.png differ diff --git a/config/bootloaders/isolinux/splash.png b/config/bootloaders/isolinux/splash.png index 8d6a1d3..a2d1094 100644 Binary files a/config/bootloaders/isolinux/splash.png and b/config/bootloaders/isolinux/splash.png differ diff --git a/config/bootloaders/pxelinux/splash.png b/config/bootloaders/pxelinux/splash.png index 8d6a1d3..a2d1094 100644 Binary files a/config/bootloaders/pxelinux/splash.png and b/config/bootloaders/pxelinux/splash.png differ diff --git a/config/bootloaders/syslinux/splash.png b/config/bootloaders/syslinux/splash.png index 8d6a1d3..a2d1094 100644 Binary files a/config/bootloaders/syslinux/splash.png and b/config/bootloaders/syslinux/splash.png differ diff --git a/config/bootstrap b/config/bootstrap index 24892da..a7d8972 100644 --- 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" diff --git a/config/hooks/live/0200-seafile.hook.chroot b/config/hooks/live/0200-seafile.hook.chroot index 1aee591..6a0d5bf 100755 --- 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 diff --git a/config/includes.chroot/etc/issue b/config/includes.chroot/etc/issue index 8fb2f00..5b76739 100644 --- a/config/includes.chroot/etc/issue +++ b/config/includes.chroot/etc/issue @@ -6,4 +6,4 @@ |_____| \r \v \n -Bienvenu ! +Bullseye ! diff --git a/config/includes.chroot/etc/motd b/config/includes.chroot/etc/motd index 08932ee..0b2141f 100644 --- a/config/includes.chroot/etc/motd +++ b/config/includes.chroot/etc/motd @@ -5,5 +5,6 @@ |____/ \_/ |_| |_| \_\\___/___\____|_| \_|\___/ |_____| -Bienvenu ! +Bullseye ! + diff --git a/config/includes.chroot/etc/os-release b/config/includes.chroot/etc/os-release index 08867b3..4bf587b 100644 --- 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/" diff --git a/config/includes.chroot/usr/local/bin/grub_boot_splash b/config/includes.chroot/usr/local/bin/grub_boot_splash index fd6b5a6..3fca468 100755 --- 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 diff --git a/config/includes.chroot/usr/share/images/desktop-base/default b/config/includes.chroot/usr/share/images/desktop-base/default index fbf2613..e63c0a4 100644 Binary files a/config/includes.chroot/usr/share/images/desktop-base/default and b/config/includes.chroot/usr/share/images/desktop-base/default differ diff --git 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 new file mode 100644 index 0000000..a2d1094 Binary files /dev/null and b/config/includes.chroot/usr/share/plymouth/themes/svpro_gnu/svprognu-grub.png differ diff --git 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 index b917121..94b21ae 100644 Binary files a/config/includes.chroot/usr/share/plymouth/themes/svpro_gnu/svprognu-splash.png and b/config/includes.chroot/usr/share/plymouth/themes/svpro_gnu/svprognu-splash.png differ diff --git a/config/includes.installer/usr/share/graphics/logo_debian.png b/config/includes.installer/usr/share/graphics/logo_debian.png index 6b539db..e31a746 100644 Binary files a/config/includes.installer/usr/share/graphics/logo_debian.png and b/config/includes.installer/usr/share/graphics/logo_debian.png differ diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 2d8d7d7..53ca43c 100644 --- 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