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

vm/spec: disable pam_systemd only in trigger

Browse Source 
The %post part is unnecessary.
This commit is contained in:
Marek Marczykowski 2012-07-09 15:52:42 +02:00
parent 78df05afe1
commit 5ee694f4d3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpm_spec/core-vm.spec
View File

@ -180,6 +180,10 @@ install -D u2mfn/libu2mfn.so $RPM_BUILD_ROOT/%{_libdir}/libu2mfn.so
cp /usr/lib/qubes/serial.conf /etc/init/serial.conf cp /usr/lib/qubes/serial.conf /etc/init/serial.conf
%triggerin -- systemd %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 mv -f /%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so.disabled
%post %post
@ -249,12 +253,6 @@ if ! [ -e /lib/firmware/updates ]; then
ln -s /lib/modules/firmware /lib/firmware/updates ln -s /lib/modules/firmware /lib/firmware/updates
fi fi
# 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
if ! grep -q '/etc/yum\.conf\.d/qubes-proxy\.conf'; then if ! grep -q '/etc/yum\.conf\.d/qubes-proxy\.conf'; then
echo >> /etc/yum.conf echo >> /etc/yum.conf
echo '# Yum does not support inclusion of config dir...' >> /etc/yum.conf echo '# Yum does not support inclusion of config dir...' >> /etc/yum.conf