[vdr] Add vdr user to dialout group (for serial remote controls), drop no longer needed pam_console config
Ville Skyttä
scop at fedoraproject.org
Mon Oct 18 17:29:54 UTC 2010
commit 09c5b2b5eadb09ab3c0553be9b6f35efcfbc4dae
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Mon Oct 18 19:20:55 2010 +0300
Add vdr user to dialout group (for serial remote controls), drop no longer needed pam_console config.
vdr.consoleperms | 16 ----------------
vdr.spec | 17 +++++------------
2 files changed, 5 insertions(+), 28 deletions(-)
---
diff --git a/vdr.spec b/vdr.spec
index 0d05551..af6f5c2 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -8,7 +8,6 @@
# - pause patch (causes OSD placement issues at least with unrebuilt text2skin)
# http://www.tolleri.net/vdr/vdr/vdr-1.6.0-2-pause-0.0.1.patch
# http://thread.gmane.org/gmane.linux.vdr/40188
-# - drop console.perms stuff altogether?
%bcond_with docs
%bcond_with plugins
@@ -49,8 +48,6 @@ Source4: %{name}-udev.rules
Source5: %{name}-reccmds.conf
Source6: %{name}-commands.conf
Source7: %{name}-runvdr.sh
-# TODO
-Source8: %{name}.consoleperms
Source9: %{name}-config.sh
Source10: %{name}-README.package
Source11: %{name}-skincurses.conf
@@ -118,7 +115,7 @@ BuildRequires: lirc-devel
BuildRequires: doxygen
BuildRequires: graphviz
%endif # docs
-# udev >= 136-1 for the cdrom and video groups
+# udev >= 136-1 for the cdrom, dialout, and video groups
Requires: udev >= 136-1
# sudo for the shutdown script, >= 1.7.2p2-3 for sudoers.d functionality
Requires: sudo >= 1.7.2p2-3
@@ -395,11 +392,6 @@ sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE4} \
> $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-%{name}.rules
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*-%{name}.rules
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d
-sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE8} \
- > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/95-%{name}.perms
-chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/*%{name}.perms
-
install -Dpm 644 %{name}.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
# devel
@@ -453,7 +445,7 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
:
%post
-usermod -a -G cdrom %{vdr_user}
+usermod -a -G cdrom,dialout %{vdr_user}
/sbin/chkconfig --add vdr
:
@@ -475,7 +467,6 @@ fi
%config(noreplace) %{_sysconfdir}/sudoers.d/vdr
%config(noreplace) %{_sysconfdir}/sysconfig/vdr
%config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
-%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
%config(noreplace) %{_sysconfdir}/rwtab.d/%{name}
%config %dir %{_sysconfdir}/sysconfig/vdr-plugins.d/
%{_initrddir}/vdr
@@ -547,7 +538,9 @@ fi
%changelog
* Sun Oct 17 2010 Ville Skyttä <ville.skytta at iki.fi>
-- Add vdr user to the cdrom group, drop related console.perms example.
+- Add vdr user to the cdrom (for optical drives) and dialout (for serial port
+ remote controls) groups.
+- Drop no longer needed pam_console configuration.
- Make vdr-i18n-to-gettext more likely to work out of the box.
- Update MainMenuHooks patch to 1.0.1.
- Update VDR_PLUGIN_ORDER in sysconfig.
More information about the scm-commits
mailing list