From 57262fc556eec34e2aa57f9a67fa4f4747408f97 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 2 May 2018 10:24:05 +0200
Subject: [PATCH 01/25] Configure Backport for Libreoffice and Remmina

---
 files/apt/10.stretch_backport.list     | 1 +
 files/apt/20-stable                    | 4 ++++
 files/apt/{10.sid.list => 20.sid.list} | 0
 files/apt/60-libreoffice               | 3 +++
 files/apt/60-remmina                   | 3 +++
 5 files changed, 11 insertions(+)
 create mode 100644 files/apt/10.stretch_backport.list
 rename files/apt/{10.sid.list => 20.sid.list} (100%)
 create mode 100644 files/apt/60-libreoffice
 create mode 100644 files/apt/60-remmina

diff --git a/files/apt/10.stretch_backport.list b/files/apt/10.stretch_backport.list
new file mode 100644
index 0000000..e988ba7
--- /dev/null
+++ b/files/apt/10.stretch_backport.list
@@ -0,0 +1 @@
+deb http://deb.debian.org/debian stretch-backports main contrib non-free
diff --git a/files/apt/20-stable b/files/apt/20-stable
index 23c7344..01cd7cb 100644
--- a/files/apt/20-stable
+++ b/files/apt/20-stable
@@ -1,3 +1,7 @@
 Package: *
 Pin:release n=sid
 Pin-Priority:-10
+
+Package: *
+Pin:release n=stretch-backport
+Pin-Priority:-10
diff --git a/files/apt/10.sid.list b/files/apt/20.sid.list
similarity index 100%
rename from files/apt/10.sid.list
rename to files/apt/20.sid.list
diff --git a/files/apt/60-libreoffice b/files/apt/60-libreoffice
new file mode 100644
index 0000000..c522ab7
--- /dev/null
+++ b/files/apt/60-libreoffice
@@ -0,0 +1,3 @@
+Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr
+in: release n=stretch-backport
+Pin-Priority: 991
diff --git a/files/apt/60-remmina b/files/apt/60-remmina
new file mode 100644
index 0000000..77a30fd
--- /dev/null
+++ b/files/apt/60-remmina
@@ -0,0 +1,3 @@
+Package: remmina remmina-plugin-rdp
+in: release n=stretch-backport
+Pin-Priority: 991

From 5db8d69cde103904f2756980c350dd81b0b34a11 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 2 May 2018 10:28:44 +0200
Subject: [PATCH 02/25] Add configuration file for fusioninventory

---
 conf/fusioninventory.conf | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 conf/fusioninventory.conf

diff --git a/conf/fusioninventory.conf b/conf/fusioninventory.conf
new file mode 100644
index 0000000..35c092a
--- /dev/null
+++ b/conf/fusioninventory.conf
@@ -0,0 +1,4 @@
+FI_SERVER="https://agent.dg.acaqb.net"
+FI_PROXY_USER="agent"
+FI_PROXY_PASS="kE9TDtP63xwK"
+FI_CONF_FILE="/etc/fusioninventory/agent.cfg"

From ace138d377a49d0180c95e410c1e8efcccec5d9b Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 2 May 2018 10:33:39 +0200
Subject: [PATCH 03/25] Copy backport source list

---
 install.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 024755f..e1fe667 100755
--- a/install.sh
+++ b/install.sh
@@ -83,7 +83,7 @@ create_fusioninv_conf () {
 }
 
 configure_drm(){
-    if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ]
+    if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] 
     then
         cat "drm" >> $INITRAMFS_CONF_FILE
     else
@@ -103,7 +103,7 @@ configure_grub (){
 }
 
 configure_plymouth (){
-    local module=$(lsmod | grep -o "i915\|radeon" | head -1)
+    local module=$(lsmod | grep -o "i915\|radeon" | head -1) 
     if [ ! "$module" == "" ]
     then
         message "\nConfigure drm modules for $module : "
@@ -116,14 +116,15 @@ configure_plymouth (){
         message "\nSelect plymouth theme : "
         plymouth-set-default-theme -R spinner &>/dev/null
         message "done" "ok"
-        message "\n"
+        message "\n" 
     else
         message "\nNo suitable kernel module found for plymouth\n" "warn"
     fi
 }
 
-message "\nAdd Debian Sid Repository :"
-cp ./files/apt/10.sid.list /etc/apt/sources.list.d/
+message "\nAdd Debian stretch backport and Sid Repository :"
+cp ./files/apt/10.stretch_backport.list /etc/apt/sources.list.d/
+cp ./files/apt/20.sid.list /etc/apt/sources.list.d/
 cp ./files/apt/20-stable /etc/apt/preferences.d/
 cp ./files/apt/80-fusioninventory /etc/apt/preferences.d/
 cp ./files/apt/80-papirus-icon-theme /etc/apt/preferences.d/

From 54712eea8bfa66b9d124091d0f13f60e9200f68d Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 2 May 2018 10:38:22 +0200
Subject: [PATCH 04/25] Add remmina and remmina-plugin-rdp package

---
 files/packages.list | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/files/packages.list b/files/packages.list
index e3c43c9..d9015d2 100644
--- a/files/packages.list
+++ b/files/packages.list
@@ -21,6 +21,7 @@ xfce4-systemload-plugin
 thunar-archive-plugin
 gnome-system-tools
 gnome-disk-utility
+gnome-keyring
 plank
 
 #Printing 
@@ -53,6 +54,8 @@ thunderbird
 thunderbird-l10n-fr
 vlc
 vlc-l10n
+remmina
+remmina-plugin-rdp
 
 #FI Agent
 fusioninventory-agent

From 21c57003370264a1c4459dd96fd9c4fd032291ee Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 2 May 2018 10:42:05 +0200
Subject: [PATCH 05/25] Error in variable name configure_plymouth

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index e1fe667..a0f5c1b 100755
--- a/install.sh
+++ b/install.sh
@@ -111,7 +111,7 @@ configure_plymouth (){
         message "done" "ok"
         message "\nConfigure grub command line : "
         local splash_enable=$(sed -rn 's/GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/\1/p' ${GRUB_DEFAULT_CONF_FILE} | grep -o "splash" )
-        [[ -z $spash_enable ]] && configure_grub || message "Grub spash kernel option exist " "warn"
+        [[ -z $splash_enable ]] && configure_grub || message "Grub splash kernel option exist " "warn"
         message "done" "ok"
         message "\nSelect plymouth theme : "
         plymouth-set-default-theme -R spinner &>/dev/null

From 886a17fd8951ba241377bca43778906d6f20c3f5 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 2 May 2018 10:46:20 +0200
Subject: [PATCH 06/25] Copy missing files for repo managing

---
 install.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index a0f5c1b..c81f077 100755
--- a/install.sh
+++ b/install.sh
@@ -123,11 +123,10 @@ configure_plymouth (){
 }
 
 message "\nAdd Debian stretch backport and Sid Repository :"
-cp ./files/apt/10.stretch_backport.list /etc/apt/sources.list.d/
-cp ./files/apt/20.sid.list /etc/apt/sources.list.d/
+cp ./files/apt/*.list /etc/apt/sources.list.d/
 cp ./files/apt/20-stable /etc/apt/preferences.d/
-cp ./files/apt/80-fusioninventory /etc/apt/preferences.d/
-cp ./files/apt/80-papirus-icon-theme /etc/apt/preferences.d/
+cp ./files/apt/60-* /etc/apt/preferences.d/
+cp ./files/apt/80-* /etc/apt/preferences.d/
 message "done\n" "ok"
 
 

From e36c0867c7eb69391cb2c1827db11f8ec8f921dc Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 2 May 2018 10:47:12 +0200
Subject: [PATCH 07/25] Error in release name

---
 files/apt/60-libreoffice | 2 +-
 files/apt/60-remmina     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/apt/60-libreoffice b/files/apt/60-libreoffice
index c522ab7..327c39f 100644
--- a/files/apt/60-libreoffice
+++ b/files/apt/60-libreoffice
@@ -1,3 +1,3 @@
 Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr
-in: release n=stretch-backport
+in: release n=stretch-backports
 Pin-Priority: 991
diff --git a/files/apt/60-remmina b/files/apt/60-remmina
index 77a30fd..f15a097 100644
--- a/files/apt/60-remmina
+++ b/files/apt/60-remmina
@@ -1,3 +1,3 @@
 Package: remmina remmina-plugin-rdp
-in: release n=stretch-backport
+in: release n=stretch-backports
 Pin-Priority: 991

From ef7570cd47dee9f7812dcfb0d1b0f93095b4688f Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 2 May 2018 11:16:23 +0200
Subject: [PATCH 08/25] Syntax error in apt pin file

---
 files/apt/60-remmina | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/apt/60-remmina b/files/apt/60-remmina
index f15a097..1662356 100644
--- a/files/apt/60-remmina
+++ b/files/apt/60-remmina
@@ -1,3 +1,3 @@
 Package: remmina remmina-plugin-rdp
-in: release n=stretch-backports
+Pin: release n=stretch-backports
 Pin-Priority: 991

From e18102d5aea76af97b1ad316d49142f3141cd229 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Thu, 3 May 2018 10:23:31 +0200
Subject: [PATCH 09/25] Various fixes

---
 files/apt/60-libreoffice | 2 +-
 install.sh               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/apt/60-libreoffice b/files/apt/60-libreoffice
index 2ac3c54..2ecfef3 100644
--- a/files/apt/60-libreoffice
+++ b/files/apt/60-libreoffice
@@ -1,3 +1,3 @@
-Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr
+Package: ~/libreoffice/
 Pin: release n=stretch-backports
 Pin-Priority: 991
diff --git a/install.sh b/install.sh
index 13bd2a0..6943391 100755
--- a/install.sh
+++ b/install.sh
@@ -82,22 +82,22 @@ create_fusioninv_conf () {
 }
 
 configure_drm(){
-    if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] 
+    if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ]
     then
-        cat "drm" >> $INITRAMFS_CONF_FILE
+        echo "drm" >> $INITRAMFS_CONF_FILE
     else
         message "DRM already done " "warn"
     fi
     if [ -z "$(grep -o $1 $INITRAMFS_CONF_FILE)" ]
     then
-        cat "$1 modeset=1" >> $INITRAMFS_CONF_FILE
+        echo "$1 modeset=1" >> $INITRAMFS_CONF_FILE
     else
         message "$1 already done " "warn"
     fi
 }
 
 configure_grub (){
-    sed -E "s/^GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 spash\"/g" ${GRUB_DEFAULT_CONF_FILE} >/dev/null
+    sed -Ei "s/^GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 splash\"/g" ${GRUB_DEFAULT_CONF_FILE} >/dev/null
     update-grub2 2>/dev/null
 }
 

From 9287d6470b279c07aead6cb0ec82a1e443619b6a Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Thu, 3 May 2018 14:40:18 +0200
Subject: [PATCH 10/25] Add fusioninventory confiuration

---
 install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install.sh b/install.sh
index 6943391..59c3c94 100755
--- a/install.sh
+++ b/install.sh
@@ -154,6 +154,10 @@ message "\nCreate users default parameters : "
 cp -R files/skel/ /etc/ &> /dev/null
 message "OK" "ok"
 
+message "\nConfigure fusioninventory"
+create_fusioninv_conf
+message "OK" "ok"
+
 #remove interface file until NM use network
 rm -rf /etc/network/interfaces
 

From 525cba5906c9e23e1a07c4a7cd8c4869cb4cf879 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Thu, 3 May 2018 14:41:23 +0200
Subject: [PATCH 11/25] Add trailing slash for FI URL

---
 conf/fusioninventory.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/fusioninventory.conf b/conf/fusioninventory.conf
index 35c092a..ecedca7 100644
--- a/conf/fusioninventory.conf
+++ b/conf/fusioninventory.conf
@@ -1,4 +1,4 @@
-FI_SERVER="https://agent.dg.acaqb.net"
+FI_SERVER="https://agent.dg.acaqb.net/"
 FI_PROXY_USER="agent"
 FI_PROXY_PASS="kE9TDtP63xwK"
 FI_CONF_FILE="/etc/fusioninventory/agent.cfg"

From 97a97d56e812442d359e041a2e8d6679dbaefbdf Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Sat, 18 Apr 2020 16:45:48 +0200
Subject: [PATCH 12/25] Make spellcheck happy

---
 install.sh | 60 ++++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/install.sh b/install.sh
index 13bd2a0..fd552ad 100755
--- a/install.sh
+++ b/install.sh
@@ -12,61 +12,62 @@ source lib/download.sh
 source conf/init.sh
 
 #Variables override
-for i in $(ls conf/*.conf)
+for i in conf/*
 do
-    source $i
+    source "$i"
 done
 
 erase_display_char () {
-    let "i=0"
-    while [  $i -lt $1 ]; do
+    local i
+    i=0
+    while [  "$i" -lt "$1" ]; do
         message "\b \b"
-        let "i=$i + 1"
+        (( i=i + 1 ))
     done
 }
 
 install () {
     nchar=0
     message "\nInstall $1 : "
-    LC_ALL=C apt-get install --no-install-recommends -y $1 2>/dev/null | while read x; do
+    LC_ALL=C apt-get install --no-install-recommends -y "$1" 2>/dev/null | while read -r x; do
 	display=""
 	pkg_name=""
         case $x in
             Get*)
-                pkg_name=$(echo $x | awk '{ printf $5 }')
+                pkg_name=$(echo "$x" | awk '{ printf $5 }')
                 display="downloading"
             ;;
             Unpack*)
-                pkg_name=$(echo $x | awk '{ printf $2 }')
+                pkg_name=$(echo "$x" |  awk '{ printf $2 }')
                 display="Unpacking"
             ;;
             *already*newest*)
-                pkg_name=$(echo $x | awk '{ printf $1 }')
-                display="Already Installed"
+                pkg_name=$(echo "$x" | awk '{ printf $1 }')
+                display="Already Ins talled"
             ;;
         esac
-	if [ ! -z "$display" ]
+	if [ -n "$display" ]
         then
             display="$display $pkg_name"
             erase_display_char $nchar
             message "$display" "info"
             nchar=${#display}
-        fi 
+        fi  
     done
     message " done" "ok"
 
 }
 
 process_package_file (){
-    for p in `cat $1 | grep  '^[^#].*'`
+    for p in $(cat "$1" | grep  '^[^#].*')
     do
-        install $p
+        install "$p"
     done
 }
 
 create_fusioninv_conf () {
     # Process Config file
-    message "\nProcess Fusion inventory configuration file : "
+    message "\nP rocess Fusion inventory configuration file : "
     #remove comments
     sed -i '/^#/ d' ${FI_CONF_FILE}
     sed -i '/^$/ d' ${FI_CONF_FILE}
@@ -82,15 +83,15 @@ create_fusioninv_conf () {
 }
 
 configure_drm(){
-    if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] 
+    if grep -o drm "$INITRAMFS_CONF_FILE"
     then
-        cat "drm" >> $INITRAMFS_CONF_FILE
+        cat "drm" >> "$INITRAMFS_CONF_FILE"
     else
         message "DRM already done " "warn"
     fi
-    if [ -z "$(grep -o $1 $INITRAMFS_CONF_FILE)" ]
+    if grep -q "$1" "$INITRAMFS_CONF_FILE"
     then
-        cat "$1 modeset=1" >> $INITRAMFS_CONF_FILE
+        cat "$1 modeset=1" >> "$INITRAMFS_CONF_FILE"
     else
         message "$1 already done " "warn"
     fi
@@ -102,15 +103,19 @@ configure_grub (){
 }
 
 configure_plymouth (){
-    local module=$(lsmod | grep -o "i915\|radeon" | head -1) 
+    local module
+    module=$(lsmod | grep -o "i915\|radeon" | head -1) 
     if [ ! "$module" == "" ]
     then
         message "\nConfigure drm modules for $module : "
-        configure_drm $module
+        configure_drm "$module"
         message "done" "ok"
         message "\nConfigure grub command line : "
-        local splash_enable=$(sed -rn 's/GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/\1/p' ${GRUB_DEFAULT_CONF_FILE} | grep -o "splash" )
-        [[ -z $splash_enable ]] && configure_grub || message "Grub splash kernel option exist " "warn"
+
+        local splash_enable
+        splash_enable=$(sed -rn 's/GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/\1/p' ${GRUB_DEFAULT_CONF_FILE} | grep -o "splash" )
+        
+        if [ -z "$splash_enable" ]; then configure_grub; else message "Grub splash kernel option exist " "warn"; fi
         message "done" "ok"
         message "\nSelect plymouth theme : "
         plymouth-set-default-theme -R spinner &>/dev/null
@@ -157,11 +162,4 @@ message "OK" "ok"
 #remove interface file until NM use network
 rm -rf /etc/network/interfaces
 
-#add elementary theme
-#mkdir -p /tmp/themes/
-#cd /tmp/themes/
-
-#download master.zip https://github.com/shimmerproject/elementary-xfce/archive/
-#unzip master.zip > /dev/null
-#mv elementary-xfce-master/* /usr/share/icons/
-#rm -rf *
+exit 0

From 8fc0f8cbd4c2bd5b04e438c7b0e14dba9aac1e23 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Sat, 18 Apr 2020 17:09:14 +0200
Subject: [PATCH 13/25] Comment sid and backport repo since it is no more
 required

---
 install.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index fd552ad..33e09a6 100755
--- a/install.sh
+++ b/install.sh
@@ -126,13 +126,14 @@ configure_plymouth (){
     fi
 }
 
-message "\nAdd Debian stretch backport and Sid Repository :"
-cp ./files/apt/*.list /etc/apt/sources.list.d/
-cp ./files/apt/20-stable /etc/apt/preferences.d/
-cp ./files/apt/60-* /etc/apt/preferences.d/
-cp ./files/apt/80-* /etc/apt/preferences.d/
-message "done\n" "ok"
-
+# rno need to install things from sid and backport in 10
+#message "\nAdd Debian stretch backport and Sid Repository :"
+#cp ./files/apt/*.list /etc/apt/sources.list.d/
+#cp ./files/apt/20-stable /etc/apt/preferences.d/
+#cp ./files/apt/60-* /etc/apt/preferences.d/
+#cp ./files/apt/80-* /etc/apt/preferences.d/
+#message "done\n" "ok"
+#
 
 apt-get update &>/dev/null
 process_package_file files/packages.list

From 18a33472251fc303c0762b4a6bd5ab29ad7e0d49 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Sun, 19 Apr 2020 15:43:36 +0200
Subject: [PATCH 14/25] condition were inverted in configure_drm()

---
 install.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 33e09a6..dcbaa2e 100755
--- a/install.sh
+++ b/install.sh
@@ -83,17 +83,17 @@ create_fusioninv_conf () {
 }
 
 configure_drm(){
-    if grep -o drm "$INITRAMFS_CONF_FILE"
+    if grep -q drm "$INITRAMFS_CONF_FILE"
     then
-        cat "drm" >> "$INITRAMFS_CONF_FILE"
-    else
         message "DRM already done " "warn"
+    else
+        cat "drm" >> "$INITRAMFS_CONF_FILE"
     fi
     if grep -q "$1" "$INITRAMFS_CONF_FILE"
     then
-        cat "$1 modeset=1" >> "$INITRAMFS_CONF_FILE"
-    else
         message "$1 already done " "warn"
+    else
+        cat "$1 modeset=1" >> "$INITRAMFS_CONF_FILE"
     fi
 }
 

From 7409cc883c5c82c79e5880b34dfa1f21e7b01e3d Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Sun, 19 Apr 2020 15:45:04 +0200
Subject: [PATCH 15/25] Remove unecessary lines for repo

---
 install.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/install.sh b/install.sh
index dcbaa2e..c2984bc 100755
--- a/install.sh
+++ b/install.sh
@@ -126,14 +126,6 @@ configure_plymouth (){
     fi
 }
 
-# rno need to install things from sid and backport in 10
-#message "\nAdd Debian stretch backport and Sid Repository :"
-#cp ./files/apt/*.list /etc/apt/sources.list.d/
-#cp ./files/apt/20-stable /etc/apt/preferences.d/
-#cp ./files/apt/60-* /etc/apt/preferences.d/
-#cp ./files/apt/80-* /etc/apt/preferences.d/
-#message "done\n" "ok"
-#
 
 apt-get update &>/dev/null
 process_package_file files/packages.list

From 0062323e4d8f999bb77babc97abddc9fe6c450ef Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Sun, 19 Apr 2020 15:48:03 +0200
Subject: [PATCH 16/25] Remove unecessary files for apt

---
 files/apt/10.stretch_backport.list | 1 -
 files/apt/20-stable                | 7 -------
 files/apt/20.sid.list              | 1 -
 files/apt/60-libreoffice           | 3 ---
 files/apt/60-remmina               | 3 ---
 files/apt/80-fusioninventory       | 3 ---
 files/apt/80-papirus-icon-theme    | 3 ---
 7 files changed, 21 deletions(-)
 delete mode 100644 files/apt/10.stretch_backport.list
 delete mode 100644 files/apt/20-stable
 delete mode 100644 files/apt/20.sid.list
 delete mode 100644 files/apt/60-libreoffice
 delete mode 100644 files/apt/60-remmina
 delete mode 100644 files/apt/80-fusioninventory
 delete mode 100644 files/apt/80-papirus-icon-theme

diff --git a/files/apt/10.stretch_backport.list b/files/apt/10.stretch_backport.list
deleted file mode 100644
index e988ba7..0000000
--- a/files/apt/10.stretch_backport.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://deb.debian.org/debian stretch-backports main contrib non-free
diff --git a/files/apt/20-stable b/files/apt/20-stable
deleted file mode 100644
index 01cd7cb..0000000
--- a/files/apt/20-stable
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: *
-Pin:release n=sid
-Pin-Priority:-10
-
-Package: *
-Pin:release n=stretch-backport
-Pin-Priority:-10
diff --git a/files/apt/20.sid.list b/files/apt/20.sid.list
deleted file mode 100644
index c0bba96..0000000
--- a/files/apt/20.sid.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ftp.debian.org/debian sid main
diff --git a/files/apt/60-libreoffice b/files/apt/60-libreoffice
deleted file mode 100644
index 2ac3c54..0000000
--- a/files/apt/60-libreoffice
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr
-Pin: release n=stretch-backports
-Pin-Priority: 991
diff --git a/files/apt/60-remmina b/files/apt/60-remmina
deleted file mode 100644
index f15a097..0000000
--- a/files/apt/60-remmina
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: remmina remmina-plugin-rdp
-in: release n=stretch-backports
-Pin-Priority: 991
diff --git a/files/apt/80-fusioninventory b/files/apt/80-fusioninventory
deleted file mode 100644
index 733b9b8..0000000
--- a/files/apt/80-fusioninventory
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: fusioninventory-agent
-Pin: release n=sid
-Pin-Priority: 991
diff --git a/files/apt/80-papirus-icon-theme b/files/apt/80-papirus-icon-theme
deleted file mode 100644
index f1f69ee..0000000
--- a/files/apt/80-papirus-icon-theme
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: papirus-icon-theme
-Pin: release n=sid
-Pin-Priority: 991

From 152da7d8b17343f65c62a2b85cdc08b5f5fd4d54 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Thu, 30 Apr 2020 09:47:09 +0200
Subject: [PATCH 17/25] Change cat to echo :-/

---
 install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index c2984bc..ec3e176 100755
--- a/install.sh
+++ b/install.sh
@@ -87,13 +87,13 @@ configure_drm(){
     then
         message "DRM already done " "warn"
     else
-        cat "drm" >> "$INITRAMFS_CONF_FILE"
+        echo "drm" >> "$INITRAMFS_CONF_FILE"
     fi
     if grep -q "$1" "$INITRAMFS_CONF_FILE"
     then
         message "$1 already done " "warn"
     else
-        cat "$1 modeset=1" >> "$INITRAMFS_CONF_FILE"
+        echo "$1 modeset=1" >> "$INITRAMFS_CONF_FILE"
     fi
 }
 

From f7fdcacfe62a23f9eb2b8425bc4f31e205d9851e Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 25 May 2020 09:54:51 +0200
Subject: [PATCH 18/25] Cange distribution name for unattended-upgrades

---
 files/apt/50unattended-upgrades | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/apt/50unattended-upgrades b/files/apt/50unattended-upgrades
index a49b2de..5bd1983 100644
--- a/files/apt/50unattended-upgrades
+++ b/files/apt/50unattended-upgrades
@@ -1,8 +1,8 @@
 // ACAQB unattended upgrades configuration file
 Unattended-Upgrade::Origin-Pattern {
-    "o=Debian,n=stretch";
-    "o=Debian,n=stretch-updates";
-    "o=Debian,n=stretch,l=Debian-Security";
+    "o=Debian,n=buster";
+    "o=Debian,n=buster-updates";
+    "o=Debian,n=buster,l=Debian-Security";
     "o=Debian,n=sid";
 };
 Unattended-Upgrade::Remove-Unused-Dependencies "true";

From fa21149889cfb84f1400cf1ff364486f8e2d43aa Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 25 May 2020 10:26:04 +0200
Subject: [PATCH 19/25] Remove custom sources.list

---
 files/sources.list | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 files/sources.list

diff --git a/files/sources.list b/files/sources.list
deleted file mode 100644
index a80ad2d..0000000
--- a/files/sources.list
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://ftp.fr.debian.org/debian unstable main contrib non-free
-#deb http://ftp.fr.debian.org/debian unstable-updates main
-#deb http://ftp.fr.debian.org/ unstable/updates main

From 46845929ae500527ecc22366761739097bed8cd0 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 25 May 2020 10:26:45 +0200
Subject: [PATCH 20/25] Add apt-listchanges package for unattended-upgrades

---
 files/packages.list | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/packages.list b/files/packages.list
index e3c43c9..6134120 100644
--- a/files/packages.list
+++ b/files/packages.list
@@ -3,6 +3,7 @@
 pulseaudio
 unzip
 unattended-upgrades
+apt-listchanges
 
 # Desktop
 xorg

From 2de484a0b49d7496cd62cbad80790719f2267b5d Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 25 May 2020 10:34:22 +0200
Subject: [PATCH 21/25] Activate unattended upgrades via dpkg

---
 install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install.sh b/install.sh
index ec3e176..50cd949 100755
--- a/install.sh
+++ b/install.sh
@@ -133,6 +133,8 @@ process_package_file files/packages.list
 message "Activate unattended upgrades : "
 cp ./files/apt/20auto-upgrades /etc/apt/apt.conf.d/
 cp ./files/apt/50unattended-upgrades /etc/apt/apt.conf.d/
+echo unattended-upgrades unattended-upgrades/enable_auto_updates boolean true | debconf-set-selections
+dpkg-reconfigure -f noninteractive unattended-upgrades
 message "done" "ok"
 
 message "\ninstall custom background images : "

From 1afbbdb4a57a9c884a59fdc34fae9e1f280ee699 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 25 May 2020 12:17:00 +0200
Subject: [PATCH 22/25] Configure unattended upgrade for current stable

---
 files/apt/20auto-upgrades       |  1 +
 files/apt/50unattended-upgrades | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/files/apt/20auto-upgrades b/files/apt/20auto-upgrades
index 8d6d7c8..5bf85d3 100644
--- a/files/apt/20auto-upgrades
+++ b/files/apt/20auto-upgrades
@@ -1,2 +1,3 @@
 APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Unattended-Upgrade "1";
+APT::Periodic::AutocleanInterval "7";
diff --git a/files/apt/50unattended-upgrades b/files/apt/50unattended-upgrades
index 5bd1983..bb466a5 100644
--- a/files/apt/50unattended-upgrades
+++ b/files/apt/50unattended-upgrades
@@ -1,10 +1,10 @@
 // ACAQB unattended upgrades configuration file
-Unattended-Upgrade::Origin-Pattern {
-    "o=Debian,n=buster";
-    "o=Debian,n=buster-updates";
-    "o=Debian,n=buster,l=Debian-Security";
-    "o=Debian,n=sid";
+Unattended-Upgrade::Origins-Pattern {
+    "o=Debian,n=${distro_codename}";
+    "o=Debian,n=${distro_codename}-updates";
+    "o=Debian,n=${distro_codename},l=Debian-Security";
 };
 Unattended-Upgrade::Remove-Unused-Dependencies "true";
 Unattended-Upgrade::MinimalSteps "true";
+Unattended-Upgrade::AutoFixInterruptedDpkg "true";
 Acquire::http::Dl-Limit "50";

From a19b1960107c2c1ab66162bf821ab1355da36f55 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 26 Oct 2020 15:42:40 +0100
Subject: [PATCH 23/25] Add exfat and ntfs support

---
 files/packages.list | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/files/packages.list b/files/packages.list
index d9015d2..dddbd50 100644
--- a/files/packages.list
+++ b/files/packages.list
@@ -3,6 +3,8 @@
 pulseaudio
 unzip
 unattended-upgrades
+exfat-utils
+ntfs-3g
 
 # Desktop
 xorg

From a235cfa3fad2a8b66b1f5d21b0240be089618f0e Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 26 Oct 2020 16:08:11 +0100
Subject: [PATCH 24/25] Add apt-listchanges packages

---
 files/packages.list | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/packages.list b/files/packages.list
index dddbd50..ca766ed 100644
--- a/files/packages.list
+++ b/files/packages.list
@@ -3,6 +3,7 @@
 pulseaudio
 unzip
 unattended-upgrades
+apt-listchanges
 exfat-utils
 ntfs-3g
 

From 77cc7fcf2ab1db4fe60a788b32b37787fcc7a3eb Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Thu, 12 Nov 2020 13:11:17 +0100
Subject: [PATCH 25/25] Add missing packages

---
 files/packages.list | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/files/packages.list b/files/packages.list
index ca766ed..c972fa3 100644
--- a/files/packages.list
+++ b/files/packages.list
@@ -5,7 +5,11 @@ unzip
 unattended-upgrades
 apt-listchanges
 exfat-utils
+exfat-fuse
 ntfs-3g
+firmware-linux
+firmware-linux-nonfree
+firmware-realtek
 
 # Desktop
 xorg
@@ -59,6 +63,7 @@ vlc
 vlc-l10n
 remmina
 remmina-plugin-rdp
+xarchiver
 
 #FI Agent
 fusioninventory-agent