From dfada673f8b14c83ee0a4aab1cfd5b562e5a3812 Mon Sep 17 00:00:00 2001
From: Lorenzo Palinuro Faletra <palinuro@parrotsec.org>
Date: Mon, 8 Apr 2019 21:30:02 +0200
Subject: [PATCH] Import Debian version 5.20190329+parrot10

live-config (2:5.20190329+parrot10) UNRELEASED; urgency=medium

  * Make live-config start before login managers.
  * Implement hook to add live user to firejail whitelist.

live-config (2:5.20190329+parrot9) testing; urgency=medium

  * Move live-config to default.target
---
 backend/systemd/live-config.systemd |  4 ++--
 components/0030-user-setup          |  3 +++
 debian/changelog                    | 13 +++++++++++++
 debian/rules                        |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/backend/systemd/live-config.systemd b/backend/systemd/live-config.systemd
index e3878ab..bd6eae2 100644
--- a/backend/systemd/live-config.systemd
+++ b/backend/systemd/live-config.systemd
@@ -9,7 +9,7 @@
 [Unit]
 Description=live-config configures a live system during the boot process (late userspace).
 Documentation=man:live-config
-Before=basic.target
+Before=live-tools.service systemd-user-sessions.service
 After=local-fs.target systemd-tmpfiles-setup.service haveged.service
 DefaultDependencies=no
 ConditionPathExists=/bin/live-config
@@ -22,4 +22,4 @@ ExecStart=/bin/live-config
 TimeoutSec=20
 
 [Install]
-WantedBy=basic.target
+WantedBy=default.target
diff --git a/components/0030-user-setup b/components/0030-user-setup
index 3c330f5..478b372 100755
--- a/components/0030-user-setup
+++ b/components/0030-user-setup
@@ -87,6 +87,9 @@ EOF
 	/usr/lib/user-setup/user-setup-apply 2>&1 \
 	| grep -v "Shadow passwords are now on"
 	set -e
+	
+	# Adding user to firejail
+	[ ! -x /usr/bin/firecfg ] || /usr/bin/firecfg --add-users=${LIVE_USERNAME} > /dev/null || true
 
 	# Creating state file
 	touch /var/lib/live/config/user-setup
diff --git a/debian/changelog b/debian/changelog
index 9e96465..f26ded0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+live-config (2:5.20190329+parrot10) UNRELEASED; urgency=medium
+
+  * Make live-config start before login managers.
+  * Implement hook to add live user to firejail whitelist.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Mon, 08 Apr 2019 21:30:02 +0200
+
+live-config (2:5.20190329+parrot9) testing; urgency=medium
+
+  * Move live-config to default.target
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Mon, 08 Apr 2019 15:47:42 +0200
+
 live-config (2:5.20190329+parrot8) testing; urgency=medium
 
   * Remve live-debconfig scripts.
diff --git a/debian/rules b/debian/rules
index 62d0297..322130f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_install:
 	rm -f debian/tmp/live/config/*live-debconfig*
 
 	# Removing unused files
-	rm -f debian/tmp/usr/share/doc/live-config/COPYING debian/tmp
+	rm -f debian/tmp/usr/share/doc/live-config/COPYING
 
 override_dh_compress:
 	dh_compress -Xusr/share/doc/live-config/examples
-- 
2.22.0