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

debian: More depends for debian as netvm and some configuration tweaks.

Browse Source 
Jessie base loads as netvm; wheezy base giving bad window error when trying to start nm-applet
Fixed qt MIT-SHM graphics issue
This commit is contained in:
Jason Mehring 2014-11-08 02:58:07 -05:00
parent 1f93dc0a60
commit cadb102781
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -9,7 +9,7 @@ Vcs-Git: git://git.qubes-os.org/marmarek/core-agent-linux.git
Package: qubes-core-agent Package: qubes-core-agent
Architecture: any Architecture: any
Depends: qubes-utils, libvchan-xen, xenstore-utils, iptables-persistent, xserver-xorg-video-dummy, xen-utils-common, tinyproxy, ethtool, python2.7, init-system-helpers, xdg-user-dirs, gnome-themes-standard, xsettingsd, gnome-packagekit, chrony, ntpdate, network-manager (>= 0.8.1-1), iptables, net-tools, nautilus-actions, initscripts, imagemagick, fakeroot, notification-daemon, systemd, gnome-terminal, locales, sudo, dmsetup, psmisc, ncurses-term, xserver-xorg-core, x11-xserver-utils, xinit, acpid, ${shlibs:Depends}, ${misc:Depends} Depends: qubes-utils, libvchan-xen, xenstore-utils, iptables-persistent, xserver-xorg-video-dummy, xen-utils-common, tinyproxy, ethtool, python2.7, init-system-helpers, xdg-user-dirs, gnome-themes-standard, xsettingsd, gnome-packagekit, chrony, ntpdate, network-manager (>= 0.8.1-1), network-manager-gnome, haveged, iptables, net-tools, nautilus-actions, initscripts, imagemagick, fakeroot, notification-daemon, systemd, gnome-terminal, locales, sudo, dmsetup, psmisc, ncurses-term, xserver-xorg-core, x11-xserver-utils, xinit, acpid, ${shlibs:Depends}, ${misc:Depends}
Conflicts: qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit Conflicts: qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit
Description: Qubes core agent Description: Qubes core agent
This package includes various daemons necessary for qubes domU support, This package includes various daemons necessary for qubes domU support,

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

@ -85,7 +85,7 @@ systemdInfo() {
unit=${1} unit=${1}
return_global_var=${2} return_global_var=${2}
declare -A -g INFO declare -A INFO
while read line; do while read line; do
INFO[${line%%=*}]="${line##*=}" INFO[${line%%=*}]="${line##*=}"
done < <(systemctl show ${unit} 2> /dev/null) done < <(systemctl show ${unit} 2> /dev/null)
@ -178,14 +178,16 @@ case "${1}" in
done done
# Stops Qt form using the MIT-SHM X11 Shared Memory Extension # 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 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 # Sudo's defualt umask is 077 so set sane default of 022
# Also don't allow QT to used shared memory to prevent errors # Also don't allow QT to used shared memory to prevent errors
echo 'Defaults umask = 0002' > /etc/sudoers.d/umask echo 'Defaults umask = 0002' > /etc/sudoers.d/umask
echo 'Defaults umask_override' >> /etc/sudoers.d/umask echo 'Defaults umask_override' >> /etc/sudoers.d/umask
echo 'Defaults env_keep += "QT_X11_NO_MITSHM"' > /etc/sudoers.d/qt_x11_no_mitshm.sh chmod 0440 /etc/sudoers.d/umask
chmod 0755 /etc/sudoers.d/qt_x11_no_mitshm.sh 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
@ -193,8 +195,19 @@ case "${1}" in
echo 'plugins = keyfile' >> /etc/NetworkManager/NetworkManager.conf echo 'plugins = keyfile' >> /etc/NetworkManager/NetworkManager.conf
echo '[keyfile]' >> /etc/NetworkManager/NetworkManager.conf echo '[keyfile]' >> /etc/NetworkManager/NetworkManager.conf
fi fi
/usr/lib/qubes/qubes-fix-nm-conf.sh # XXX - Disabling for now; will need to change script to not include ifcfg-rh plugin
#/usr/lib/qubes/qubes-fix-nm-conf.sh
# XXX: Test to see if this will satisify dispatcher dependancy
if [ ! -e "/lib/systemd/system/org.freedesktop.nm_dispatcher.service" ]; then
ln -s org.freedesktop.nm_dispatcher.service NetworkManager-dispatcher.service
fi
# NetworkManager is looking for this to load. Check into a debian alternative
#
# We are writing the config in qubes-fix-nm-conf.sh to use the ifcfg-rh plugin
#
#<error> [1415425011.785917] [main.c:566] main(): failed to initialize settings storage: Could not load plugin 'ifcfg-rh': /usr/lib/NetworkManager/libnm-settings-plugin-ifcfg-rh.so: cannot open shared object file: No such file or directory
# Remove ip_forward setting from sysctl, so NM will not reset it # Remove ip_forward setting from sysctl, so NM will not reset it
sed 's/^net.ipv4.ip_forward.*/#\0/' -i /etc/sysctl.conf sed 's/^net.ipv4.ip_forward.*/#\0/' -i /etc/sysctl.conf