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

Revert "vm/spec: disable pam_systemd globally (#607)" (#626)

Browse Source 
This reverts commit 8ec4b6963b71b95bc0cda6dd80d99bf60aa9caec.
This caused regression (#626).

Conflicts:

	rpm_spec/core-vm.spec
This commit is contained in:
Marek Marczykowski 2012-07-16 12:49:41 +02:00
parent d9291ab2b4
commit 0f6f445ece
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpm_spec/core-vm.spec
View File

@ -188,13 +188,6 @@ install -D u2mfn/libu2mfn.so $RPM_BUILD_ROOT/%{_libdir}/libu2mfn.so
%triggerin -- initscripts
cp /usr/lib/qubes/serial.conf /etc/init/serial.conf
%triggerin -- systemd
# Disable pam_systemd - we (hopefully) don't need it, but it cause some minor
# problems (http://wiki.qubes-os.org/trac/ticket/607)
# /etc/pam.d/common-* are automatically (re)generated by authconfig, so its
# modification will not be persistent -> must be done this way
mv -f /%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so.disabled 2> /dev/null || :
%post
# disable some Upstart services
@ -336,7 +329,6 @@ if [ "$1" = 0 ] ; then
mv /var/lib/qubes/fstab.orig /etc/fstab
mv /var/lib/qubes/removed-udev-scripts/* /etc/udev/rules.d/
mv /var/lib/qubes/serial.orig /etc/init/serial.conf
mv /%{_lib}/security/pam_systemd.so.disabled /%{_lib}/security/pam_systemd.so
fi
%postun