[update] : new gnome copy

diff --git a/channels/gnome-mac/airootfs.any/etc/dconf/db/local.d/01-alter-gnome b/channels/gnome-mac/airootfs.any/etc/dconf/db/local.d/01-alter-gnome
index c107f23..d8818ca 100644 (file)
--- a/channels/gnome-mac/airootfs.any/etc/dconf/db/local.d/01-alter-gnome
+++ b/channels/gnome-mac/airootfs.any/etc/dconf/db/local.d/01-alter-gnome
@@ -103,7 +103,7 @@ panel-size=32
 secondarymenu-contains-showdetails=true
 show-appmenu=false
 show-apps-icon-file=''
-stockgs-keep-dash=false
+stockgs-keep-dash=true
 stockgs-keep-top-panel=false
 stockgs-panelbtn-click-only=false
 taskbar-locked=false

diff --git a/channels/gnome-mac/airootfs.any/etc/gdm/custom.conf b/channels/gnome-mac/airootfs.any/etc/gdm/custom.conf
index 584a1f2..81c47b8 100644 (file)
--- a/channels/gnome-mac/airootfs.any/etc/gdm/custom.conf
+++ b/channels/gnome-mac/airootfs.any/etc/gdm/custom.conf
@@ -2,7 +2,7 @@
 
 [daemon]
 # Uncomment the line below to force the login screen to use Xorg
-#WaylandEnable=false
+WaylandEnable=false
 
 # Auto Login Live users
 AutomaticLogin=%USERNAME%

diff --git a/channels/gnome-mac/airootfs.any/etc/polkit-1/localauthority.conf.d/org.freedesktop.logind.policy b/channels/gnome-mac/airootfs.any/etc/polkit-1/localauthority.conf.d/org.freedesktop.logind.policy
new file mode 100644 (file)
index 0000000..2a4dc79
--- /dev/null
+++ b/channels/gnome-mac/airootfs.any/etc/polkit-1/localauthority.conf.d/org.freedesktop.logind.policy
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "https://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+
+<policyconfig>
+
+  <action id="org.freedesktop.login1.power-off-multiple-sessions">
+    <description>Shutdown the system when multiple users are logged in</description>
+    <message>System policy prevents shutting down the system when other users are logged in</message>
+    <defaults>
+      <allow_inactive>yes</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+</policyconfig>
\ No newline at end of file

diff --git a/channels/gnome-mac/airootfs.any/root/customize_airootfs_gnome.sh b/channels/gnome-mac/airootfs.any/root/customize_airootfs_gnome.sh
index 3b228c4..5d01f3c 100755 (executable)
--- a/channels/gnome-mac/airootfs.any/root/customize_airootfs_gnome.sh
+++ b/channels/gnome-mac/airootfs.any/root/customize_airootfs_gnome.sh
@@ -127,8 +127,15 @@ sed -i s/%USERNAME%/${username}/g /etc/gdm/custom.conf
 
 # Set autologin session
 mkdir -p "/var/lib/AccountsService/users/"
-echo "XSession=gnome-xorg" > "/var/lib/AccountsService/users/${username}"
-echo -e "\nremove /var/lib/AccountsService/users/${username}" >> "/usr/share/calamares/final-process\n"
+remove "/var/lib/AccountsService/users/${username}"
+cat > "/var/lib/AccountsService/users/${username}" << "EOF"
+[User]
+Language=
+Session=gnome-xorg
+XSession=gnome-xorg
+Icon=/home/${username}/.face
+SystemAccount=false
+EOF
 
 # Remove file for japanese input
 if [[ ! "${language}" = "ja" ]]; then

diff --git a/channels/gnome-mac/airootfs.any/root/optimize_for_tarball.sh b/channels/gnome-mac/airootfs.any/root/optimize_for_tarball.sh
index 41cf326..79bf329 100755 (executable)
--- a/channels/gnome-mac/airootfs.any/root/optimize_for_tarball.sh
+++ b/channels/gnome-mac/airootfs.any/root/optimize_for_tarball.sh
@@ -37,12 +37,19 @@ remove /root/.automated_script.sh
 remove /etc/mkinitcpio-archiso.conf
 remove /etc/initcpio
 
-if [[ -f "/etc/systemd/journald.conf" ]]; then
-    sed -i 's/Storage=volatile/#Storage=volatile/g' "/etc/systemd/journald.conf"
-fi
+remove /etc/systemd/journald.conf.d/volatile-storage.conf
+remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
 
 remove /etc/udev/rules.d/81-dhcpcd.rules
-remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}
+remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 
 # Disabled auto login
-sed -i "s/^AutomaticLogin/#AutomaticLogin/g" "/etc/gdm/gdm.conf"
+sed -i "s/Automatic*/#Automatic/g" "/etc/gdm/custom.conf"
+
+
+# Remove dconf for live environment
+remove "/etc/dconf/db/local.d/02-live-"*
+
+
+# Update system datebase
+dconf update