summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-10-15 18:29:45 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-10-15 18:30:18 +0200
commit2b4b35b30bda7d18f1f89fcf80280289dea9ddb0 (patch)
treebf6c1da20a15935512b0951445a304b9512f9909 /ubuntu
parent9544bbcc3d194d6ab81aa7c78293fca18d0da572 (diff)
downloadtde-packaging-2b4b35b30bda7d18f1f89fcf80280289dea9ddb0.tar.gz
tde-packaging-2b4b35b30bda7d18f1f89fcf80280289dea9ddb0.zip
Add TDM configuration for needrestart on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 83ce89c88e6c8ccbff7fd65fbaa2c87d706feb28)
Diffstat (limited to 'ubuntu')
-rwxr-xr-xubuntu/maverick/tdebase/debian/rules2
-rw-r--r--ubuntu/maverick/tdebase/debian/tdm-trinity.needrestart4
2 files changed, 6 insertions, 0 deletions
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 84da82e43..216a616be 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -125,6 +125,8 @@ binary-install/tdm-trinity::
install -p -D -m644 debian/tdm-trinity.conf debian/tdm-trinity/etc/init/tdm-trinity.conf
install -p -D -m644 debian/tdm-trinity.pam debian/tdm-trinity/etc/pam.d/tdm-trinity
install -p -D -m644 debian/tdm-trinity-np.pam debian/tdm-trinity/etc/pam.d/tdm-trinity-np
+
+ install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf
binary-install/kcontrol-trinity::
mkdir -p debian/kcontrol/etc/udev/rules.d
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.needrestart b/ubuntu/maverick/tdebase/debian/tdm-trinity.needrestart
new file mode 100644
index 000000000..07fed1702
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.needrestart
@@ -0,0 +1,4 @@
+
+# Override default selection for Trinity Display Manager
+$nrconf{override_rc}{ q(^tdm) } = 0;
+