From 2ecf80db3e0033812fb9ea1d61e84b619150cc74 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 8 Nov 2016 23:29:29 +0000
Subject: Patch /sbin/finish-install to fix permissions on /var/lib/gdm on live
 boot.

---
 config/live.cfg              |  1 +
 patches/finish-install.patch | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 patches/finish-install.patch

diff --git a/config/live.cfg b/config/live.cfg
index 5a0331c..e4f8d32 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -134,6 +134,7 @@ my $_l = {
         patches => [
 	    'patches/dkms.patch',
 	    'patches/do_pkgs.patch',
+	    'patches/finish-install.patch',
         ],
         erase_rpms => [
         ],
diff --git a/patches/finish-install.patch b/patches/finish-install.patch
new file mode 100644
index 0000000..6fc80b2
--- /dev/null
+++ b/patches/finish-install.patch
@@ -0,0 +1,20 @@
+--- sbin/finish-install.orig	2016-11-09 00:00:58.898476630 +0000
++++ sbin/finish-install	2016-11-08 23:59:16.474905520 +0000
+@@ -256,13 +256,16 @@
+ }
+ 
+ sub ask_gnome_reboot() {
++    # This is needed even if we don't reboot, to allow gdm to restart
++    # if the live user logs out
++    run_program::run('/usr/bin/chown', '-R', 'gdm:gdm', '/var/lib/gdm');
++
+     my $lock_file = '/etc/draklive-install.d/gnome-reboot';
+     if (!is_mgalive()) {
+ 	if (-f $lock_file) {
+ 	    run_program::run('/usr/bin/rm', '-f', $lock_file);
+ 	    # FIXME: convert to perl/gtk* window popup for translation support
+ 	    system('/usr/bin/zenity', qw(--timeout=20 --title), N("Finishing install"), qw(--no-wrap --info --text), N("This system will be rebooted\nfor the changes to take effect!"));
+-	    run_program::run('/usr/bin/chown', '-R', 'gdm:gdm', '/var/lib/gdm');
+ 	    run_program::run('/usr/sbin/ldconfig', '-X');
+ 	    run_program::run('/usr/bin/systemctl', 'reboot');
+ 	}
-- 
cgit v1.2.1