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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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 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 12/14] 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 13/14] 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 14/14] 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