Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debian: don't generate regular conf files in postinst

Browse Source
This commit is contained in:
HW42 2015-02-02 23:33:07 +01:00 committed by Marek Marczykowski-Górecki
parent 8a9d2378f6
commit 47550ee2b6
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -198,5 +198,8 @@ install-deb:
install -D -m 644 network/ip6tables $(DESTDIR)/etc/iptables/rules.v6 install -D -m 644 network/ip6tables $(DESTDIR)/etc/iptables/rules.v6
install -d $(DESTDIR)/etc/sysctl.d install -d $(DESTDIR)/etc/sysctl.d
install -m 644 network/80-qubes.conf $(DESTDIR)/etc/sysctl.d/ install -m 644 network/80-qubes.conf $(DESTDIR)/etc/sysctl.d/
install -D -m 644 misc/profile.d_qt_x11_no_mitshm.sh $(DESTDIR)/etc/profile.d/qt_x11_no_mitshm.sh
install -D -m 440 misc/sudoers.d_umask $(DESTDIR)/etc/sudoers.d/umask
install -D -m 440 misc/sudoers.d_qt_x11_no_mitshm $(DESTDIR)/etc/sudoers.d/qt_x11_no_mitshm
install-vm: install-rh install-common install-vm: install-rh install-common

12
debian/qubes-core-agent.postinst vendored
View File

@ -211,18 +211,6 @@ case "${1}" in
dpkg-divert --divert /etc/init/${init}.conf.qubes-disabled --package qubes-core-agent --rename --add /etc/init/${init}.conf dpkg-divert --divert /etc/init/${init}.conf.qubes-disabled --package qubes-core-agent --rename --add /etc/init/${init}.conf
done done
# Stops Qt form using the MIT-SHM X11 Shared Memory Extension
echo 'export QT_X11_NO_MITSHM=1' > /etc/profile.d/qt_x11_no_mitshm.sh
chmod 0755 /etc/profile.d/qt_x11_no_mitshm.sh
# Sudo's defualt umask is 077 so set sane default of 022
# Also don't allow QT to used shared memory to prevent errors
echo 'Defaults umask = 0002' > /etc/sudoers.d/umask
echo 'Defaults umask_override' >> /etc/sudoers.d/umask
chmod 0440 /etc/sudoers.d/umask
echo 'Defaults env_keep += "QT_X11_NO_MITSHM"' > /etc/sudoers.d/qt_x11_no_mitshm
chmod 0440 /etc/sudoers.d/qt_x11_no_mitshm
# Create NetworkManager configuration if we do not have it # Create NetworkManager configuration if we do not have it
if ! [ -e /etc/NetworkManager/NetworkManager.conf ]; then if ! [ -e /etc/NetworkManager/NetworkManager.conf ]; then
echo '[main]' > /etc/NetworkManager/NetworkManager.conf echo '[main]' > /etc/NetworkManager/NetworkManager.conf

2
misc/profile.d_qt_x11_no_mitshm.sh Normal file
View File

@ -0,0 +1,2 @@
# Stops Qt form using the MIT-SHM X11 Shared Memory Extension
export QT_X11_NO_MITSHM=1

2
misc/sudoers.d_qt_x11_no_mitshm Normal file
View File

@ -0,0 +1,2 @@
# Don't allow QT to used shared memory to prevent errors
Defaults env_keep += "QT_X11_NO_MITSHM"

3
misc/sudoers.d_umask Normal file
View File

@ -0,0 +1,3 @@
# Sudo's defualt umask is 077 so set sane default of 022
Defaults umask = 0002
Defaults umask_override