From 31d67d269ad5d9c22d21032dad34254c53f98c22 Mon Sep 17 00:00:00 2001 From: Gunnar Hjalmarsson Date: Sat, 13 Feb 2016 21:25:47 +0100 Subject: Don't overwrite possible .profile file in /etc/guest-session/skel --- debian/guest-account.sh | 3 +++ debian/guest-session.profile | 1 - debian/rules | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 debian/guest-session.profile diff --git a/debian/guest-account.sh b/debian/guest-account.sh index 675eb778..f9ff2b8b 100644 --- a/debian/guest-account.sh +++ b/debian/guest-account.sh @@ -132,6 +132,9 @@ add_account () chown -R ${GUEST_USER}:${GUEST_USER} ${GUEST_HOME} fi + # delay the launch of info dialog + echo "export DIALOG_SLEEP=4" >> ${GUEST_HOME}/.profile + # setup session su ${GUEST_USER} -c "env HOME=${GUEST_HOME} site_gs=${site_gs} ${dist_gs}/setup.sh" diff --git a/debian/guest-session.profile b/debian/guest-session.profile deleted file mode 100644 index a531896d..00000000 --- a/debian/guest-session.profile +++ /dev/null @@ -1 +0,0 @@ -export DIALOG_SLEEP=4 diff --git a/debian/rules b/debian/rules index 921ca716..bc52defc 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,6 @@ override_dh_install: dh_install -X.a -X.la -Xpam.d -X'etc/init/lightdm.conf' --fail-missing install -D debian/guest-account.sh debian/lightdm/usr/sbin/guest-account install -D -m 755 debian/guest-session-setup.sh debian/lightdm/usr/share/lightdm/guest-session/setup.sh - install -D debian/guest-session.profile debian/lightdm/usr/share/lightdm/guest-session/skel/.profile chmod +x debian/lightdm/usr/lib/lightdm/lightdm-greeter-session chmod +x debian/lightdm/usr/lib/lightdm/guest-session-auto.sh -- cgit v1.2.1