divers fix

README.md

@@ -2,9 +2,28 @@
 
 Système d'exploitation x64 - 100% GNU basé sur Debian
 
-## Build live via live-build
-
+## 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...)
+```
+curl https://git.weblib.re/svpro/svpro_gnu/raw/branch/develop/build_svprognu | bash -s -- -d /dev/sdX
+```
+**La persistence sera configurée lors du 1er boot. Le démarrage peut prendre quelques minutes.
+
+### Installation physique
+Depuis le menu du live, choisir "Installation Graphique ou Experts"
+
+
+
+## Installation Dev avec live-build
+Cloner le dépôt puis :
+```
+apt install live-build
+cd <dossier du dépôt>
 lb config
 lb build
 ```
@@ -12,5 +31,5 @@ lb build
 ### ToDo
 
 - [x] Installeur
-- [ ] Live Persistence
-- [ ] Yunohost
+- [x] Live Persistence
+- [ ] Integration Yunohost

build_svprognu

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Creation de la clef ./build_svprognu -d /dev/sdX
+# Creation de l'iso seule ./build_svprognu
+
+set -e
+
+apt install -y live-build git
+git clone https://git.weblib.re/svpro/svpro_gnu.git
+cd svpro_gnu && git checkout $(git tag -l | tail -n 1)
+
+# Build iso
+lb clean
+lb config
+lb build
+ISO=$(ls *.iso)
+echo "ISO créée $(pwd)/$ISO"
+# Copie de l'image iso sur clé
+while getopts ":d: " opt; do
+case $opt in
+   d)
+	echo "Transfert en cours..."
+	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 5
+	printf 'n\np\n\n\n\nw' | fdisk $OPTARG
+	mkfs.ext4 -L persistence ${OPTARG}3
+
+	# Configuratio de la partition
+	mkdir -p ./tmp
+	mount ${OPTARG}3 ./tmp
+	echo "/ union" > ./tmp/persistence.conf
+	umount ./tmp
+
+	# Fin
+	echo "Terminé ! Vous pouvez booter sur la clé USB, la persistence sera auto-configurée lors du premier Boot !"
+	;;
+
+esac
+done
+
+exit 0

config/bootstrap

@@ -5,24 +5,8 @@
 LB_DISTRIBUTION="buster"
 
 # $LB_PARENT_DISTRIBUTION: select parent distribution to use
-# (Default: )
-LB_PARENT_DISTRIBUTION=""
-
-# $LB_DISTRIBUTION_CHROOT: select distribution to use in the chroot
 # (Default: buster)
-LB_DISTRIBUTION_CHROOT="buster"
-
-# $LB_PARENT_DISTRIBUTION_CHROOT: select parent distribution to use in the chroot
-# (Default: buster)
-LB_PARENT_DISTRIBUTION_CHROOT="buster"
-
-# $LB_DISTRIBUTION_BINARY: select distribution to use in the final image
-# (Default: buster)
-LB_DISTRIBUTION_BINARY="buster"
-
-# $LB_PARENT_DISTRIBUTION_BINARY: select parent distribution to use in the final image
-# (Default: buster)
-LB_PARENT_DISTRIBUTION_BINARY="buster"
+LB_PARENT_DISTRIBUTION="buster"
 
 # $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use
 # (Default: buster)

config/build

@@ -1,8 +1,7 @@
 [Image]
 Architecture: amd64
 Archive-Areas: main contrib non-free
-Distribution-Chroot: buster
-Distribution-Binary: buster
+Distribution: buster
 Mirror-Bootstrap: http://deb.debian.org/debian/
 
 [FIXME]

config/chroot

@@ -17,16 +17,8 @@ LB_INTERACTIVE="false"
 LB_KEYRING_PACKAGES="debian-archive-keyring"
 
 # $LB_LINUX_FLAVOURS: set kernel flavour to use
-# This is kept for backwards compatibility
 # (Default: autodetected)
-if [ -n " amd64" ]
-then
-	LB_LINUX_FLAVOURS_WITH_ARCH=" amd64"
-fi
-
-# $LB_LINUX_FLAVOURS_WITH_ARCH: 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
 # (Default: autodetected)

config/common

@@ -87,32 +87,26 @@ LB_TASKSEL="apt"
 # live-build options
 
 # $_BREAKPOINTS: enable breakpoints
-# If set here, overrides the command line option
 # (Default: false)
 #_BREAKPOINTS="false"
 
 # $_DEBUG: enable debug
-# If set here, overrides the command line option
 # (Default: false)
 #_DEBUG="false"
 
 # $_COLOR: enable color
-# If set here, overrides the command line option
 # (Default: false)
 #_COLOR="false"
 
 # $_FORCE: enable force
-# If set here, overrides the command line option
 # (Default: false)
 #_FORCE="false"
 
 # $_QUIET: enable quiet
-# If set here, overrides the command line option
 # (Default: false)
-#_QUIET="false"
+_QUIET="false"
 
 # $_VERBOSE: enable verbose
-# If set here, overrides the command line option
 # (Default: false)
 #_VERBOSE="false"
 

config/includes.chroot/etc/issue

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

config/includes.chroot/etc/motd

@@ -0,0 +1,9 @@
+  ______     ______  ____   ___     ____ _   _ _   _ 
+ / ___\ \   / /  _ \|  _ \ / _ \   / ___| \ | | | | |
+ \___ \\ \ / /| |_) | |_) | | | | | |  _|  \| | | | |
+  ___) |\ V / |  __/|  _ <| |_| | | |_| | |\  | |_| |
+ |____/  \_/  |_|   |_| \_\\___/___\____|_| \_|\___/ 
+                              |_____|                
+
+Bienvenu !
+

config/includes.chroot/etc/os-release

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

config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

@@ -17,6 +17,8 @@
         <value type="int" value="5"/>
         <value type="int" value="6"/>
         <value type="int" value="2"/>
+        <value type="int" value="7"/>
+        <value type="int" value="8"/>
       </property>
       <property name="background-style" type="uint" value="1"/>
       <property name="background-color" type="array">
@@ -64,5 +66,9 @@
       </property>
     </property>
     <property name="plugin-3" type="string" value="tasklist"/>
+    <property name="plugin-7" type="string" value="pulseaudio">
+      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+    </property>
+    <property name="plugin-8" type="string" value="power-manager-plugin"/>
   </property>
 </channel>

config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-power-manager" version="1.0">
+  <property name="xfce4-power-manager" type="empty">
+    <property name="power-button-action" type="empty"/>
+    <property name="brightness-switch-restore-on-exit" type="int" value="-1"/>
+    <property name="brightness-switch" type="int" value="0"/>
+  </property>
+</channel>

config/includes.chroot/usr/lib/live/config/0100-live-password

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+usermod -p 'svRILkoxYL.AE' svpro_gnu

config/package-lists/live.list.chroot

@@ -26,3 +26,5 @@ net-tools
 qtpass
 davfs2
 xtightvncviewer
+nextcloud-desktop
+nautilus-nextcloud

stick_build

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# stick_build /dev/sdX
-
-set -e
-
-ISO="live_svpro_gnu-amd64.hybrid.iso"
-
-# Recuperation iso
-echo "Téléchargement de l'iso..."
-sleep 5
-wget -O ${ISO} https://samuel.vermeulen.pro/telechargement/live_svpro_gnu-amd64.hybrid.iso
-wget -O ${ISO}.md5 https://samuel.vermeulen.pro/telechargement/live_svpro_gnu-amd64.hybrid.iso.md5
-echo "Vérification de l'image..."
-
-if ! md5sum -c ${ISO}.md5
-	then
-	echo "ISO Corompue. Abandon !!"
-	rm -f ${ISO} ${ISO}.md5
-	exit 1
-fi
-
-# Copie de l'image iso sur clé
-echo "Transfert en cours..."
-dd if=${ISO} of=$1 bs=4M status=progress
-sync
-
-# Création de la partition dédiée à la persistence
-echo "Création de la persistence..."
-sleep 5
-printf 'n\np\n\n\n\nw' | fdisk $1
-mkfs.ext4 -L persistence ${1}3
-
-# Configuratio de la partition
-mount ${1}3 /mnt
-echo / union > /mnt/persistence.conf
-umount /mnt
-
-# Fin
-echo "Terminé ! Vous pouvez booter sur la clé USB, la persistence sera auto-configurée lors du premier Boot !"
-
-
-exit 0