summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-01-08 11:52:42 +0200
committerThomas Backlund <tmb@mageia.org>2015-01-08 11:52:42 +0200
commit2082157964410e4f247b838015738350b9550558 (patch)
tree9a461345fb2fa2cb72870f6ce0a66369447dd4d1
parent9d7dd9f94530cd5160ebb202206e937059a59221 (diff)
downloaddraklive-config-2082157964410e4f247b838015738350b9550558.tar
draklive-config-2082157964410e4f247b838015738350b9550558.tar.gz
draklive-config-2082157964410e4f247b838015738350b9550558.tar.bz2
draklive-config-2082157964410e4f247b838015738350b9550558.tar.xz
draklive-config-2082157964410e4f247b838015738350b9550558.zip
enforce permissions on /home/live
-rw-r--r--config/live.cfg2
-rwxr-xr-xfiles/draklive-install.d/run.d/generate-gtk-icon-cache.sh3
-rwxr-xr-xfiles/draklive-install.d/run.d/home-live-permissions.sh5
3 files changed, 7 insertions, 3 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 06426de..6da844a 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -85,6 +85,8 @@ my $_l = {
[ "files/finish-install.$live->{settings}{media}", '/etc/sysconfig/finish-install', { mode => 0644 } ],
#- disable speedboot for first boot after disk installation
[ 'files/draklive-install.d/remove.d/disable-speedboot', '/etc/draklive-install.d/remove.d/disable-speedboot', { mode => 0644 } ],
+ # fix for sometimes wrong permissions
+ [ 'files/draklive-install.d/run.d/home-live-permissions.sh', '/etc/draklive-install.d/run.d/home-live-permissions.sh', { mode => 755 } ],
if_($live->{settings}{desktop} eq 'KDE4',
[ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ]),
diff --git a/files/draklive-install.d/run.d/generate-gtk-icon-cache.sh b/files/draklive-install.d/run.d/generate-gtk-icon-cache.sh
index cd65647..e920320 100755
--- a/files/draklive-install.d/run.d/generate-gtk-icon-cache.sh
+++ b/files/draklive-install.d/run.d/generate-gtk-icon-cache.sh
@@ -5,6 +5,3 @@ for icondir in /usr/share/icons/*; do
/usr/bin/gtk-update-icon-cache --force --quiet "$icondir";
fi
done
-if [ -d "/home/live" ]; then
- chown -R live:live /home/live
-fi
diff --git a/files/draklive-install.d/run.d/home-live-permissions.sh b/files/draklive-install.d/run.d/home-live-permissions.sh
new file mode 100755
index 0000000..a4d5141
--- /dev/null
+++ b/files/draklive-install.d/run.d/home-live-permissions.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -d "/home/live" ]; then
+ chown -R live:live /home/live
+fi