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

vm/spec: remove dupplicated commnds, suppress error message

Browse Source
This commit is contained in:
Marek Marczykowski 2012-07-12 03:48:34 +02:00
parent 1b00952d44
commit 4f3f427e10
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpm_spec/core-vm.spec
View File

@ -184,7 +184,7 @@ cp /usr/lib/qubes/serial.conf /etc/init/serial.conf
# problems (http://wiki.qubes-os.org/trac/ticket/607) # problems (http://wiki.qubes-os.org/trac/ticket/607)
# /etc/pam.d/common-* are automatically (re)generated by authconfig, so its # /etc/pam.d/common-* are automatically (re)generated by authconfig, so its
# modification will not be persistent -> must be done this way # modification will not be persistent -> must be done this way
mv -f /%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so.disabled mv -f /%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so.disabled 2> /dev/null || :
%post %post
@ -557,10 +557,6 @@ done
/bin/systemctl enable qubes-update-check.timer 2> /dev/null /bin/systemctl enable qubes-update-check.timer 2> /dev/null
# Disable D-BUS activation of NetworkManager - in AppVm it causes problems (eg PackageKit timeouts)
/bin/systemctl disable NetworkManager.service 2> /dev/null
/bin/systemctl mask dbus-org.freedesktop.NetworkManager.service 2> /dev/null
# Install overriden services only when original exists # Install overriden services only when original exists
for srv in cups NetworkManager ntpd; do for srv in cups NetworkManager ntpd; do
if [ -f /lib/systemd/system/$srv.service ]; then if [ -f /lib/systemd/system/$srv.service ]; then
@ -610,7 +606,10 @@ rm -f /etc/systemd/system/getty.target.wants/getty@tty*.service
/bin/systemctl enable ntpd.service 2> /dev/null /bin/systemctl enable ntpd.service 2> /dev/null
# Disable original service to enable overriden one # Disable original service to enable overriden one
/bin/systemctl disable NetworkManager.service 2> /dev/null /bin/systemctl disable NetworkManager.service 2> /dev/null
# Disable D-BUS activation of NetworkManager - in AppVm it causes problems (eg PackageKit timeouts)
/bin/systemctl mask dbus-org.freedesktop.NetworkManager.service 2> /dev/null
/bin/systemctl enable NetworkManager.service 2> /dev/null /bin/systemctl enable NetworkManager.service 2> /dev/null
# Enable cups only when it is real SystemD service # Enable cups only when it is real SystemD service
[ -e /lib/systemd/system/cups.service ] && /bin/systemctl enable cups.service 2> /dev/null [ -e /lib/systemd/system/cups.service ] && /bin/systemctl enable cups.service 2> /dev/null