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

Configure only installed programs

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-05-21 20:21:15 +02:00
parent 923af1c94b
commit 486b148a08
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network/show-hide-nm-applet.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
type nm-applet &> /dev/null || exit 0
# Hide nm-applet when network-manager is disabled # Hide nm-applet when network-manager is disabled
nm_enabled=false nm_enabled=false
[ -f /var/run/qubes-service/network-manager ] && nm_enabled=true [ -f /var/run/qubes-service/network-manager ] && nm_enabled=true

25
rpm_spec/core-vm.spec
View File

@ -48,6 +48,7 @@ Requires: net-tools
Requires: nautilus-actions Requires: nautilus-actions
Requires: qubes-core-vm-kernel-placeholder Requires: qubes-core-vm-kernel-placeholder
Requires: qubes-utils Requires: qubes-utils
Requires: initscripts
%if %{fedora} >= 20 %if %{fedora} >= 20
# gpk-update-viewer required by qubes-manager # gpk-update-viewer required by qubes-manager
Requires: gnome-packagekit-updater Requires: gnome-packagekit-updater
@ -173,11 +174,6 @@ echo 'OnlyShowIn=GNOME;QUBES;' >> /etc/xdg/autostart/nm-applet.desktop || :
echo 'OnlyShowIn=GNOME;NetVM;' >> /etc/xdg/autostart/nm-applet.desktop || : echo 'OnlyShowIn=GNOME;NetVM;' >> /etc/xdg/autostart/nm-applet.desktop || :
%endif %endif
# Enable autostart of notification-daemon when installed
if [ ! -e /etc/xdg/autostart/notification-daemon.desktop ]; then
ln -s /usr/share/applications/notification-daemon.desktop /etc/xdg/autostart/
fi
usermod -p '' root usermod -p '' root
usermod -L user usermod -L user
@ -224,11 +220,6 @@ if [ -e /etc/init/serial.conf ] && ! [ -f /var/lib/qubes/serial.orig ] ; then
cp /etc/init/serial.conf /var/lib/qubes/serial.orig cp /etc/init/serial.conf /var/lib/qubes/serial.orig
fi fi
#echo "--> Disabling SELinux..."
sed -e s/^SELINUX=.*$/SELINUX=disabled/ </etc/selinux/config >/etc/selinux/config.processed
mv /etc/selinux/config.processed /etc/selinux/config
setenforce 0 2>/dev/null
# Remove most of the udev scripts to speed up the VM boot time # Remove most of the udev scripts to speed up the VM boot time
# Just leave the xen* scripts, that are needed if this VM was # Just leave the xen* scripts, that are needed if this VM was
# ever used as a net backend (e.g. as a VPN domain in the future) # ever used as a net backend (e.g. as a VPN domain in the future)
@ -256,6 +247,20 @@ mkdir -p /rw
#mv /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0.orig #mv /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0.orig
#grep -v HWADDR /etc/sysconfig/network-scripts/ifcfg-eth0.orig > /etc/sysconfig/network-scripts/ifcfg-eth0 #grep -v HWADDR /etc/sysconfig/network-scripts/ifcfg-eth0.orig > /etc/sysconfig/network-scripts/ifcfg-eth0
%triggerin -- notification-daemon
# Enable autostart of notification-daemon when installed
if [ ! -e /etc/xdg/autostart/notification-daemon.desktop ]; then
ln -s /usr/share/applications/notification-daemon.desktop /etc/xdg/autostart/
fi
exit 0
%triggerin -- selinux-policy
#echo "--> Disabling SELinux..."
sed -e s/^SELINUX=.*$/SELINUX=disabled/ </etc/selinux/config >/etc/selinux/config.processed
mv /etc/selinux/config.processed /etc/selinux/config
setenforce 0 2>/dev/null
exit 0
%preun %preun
if [ "$1" = 0 ] ; then if [ "$1" = 0 ] ; then
# no more packages left # no more packages left