diff --git a/SOURCES/conman-0.2.7-num_threads.patch b/SOURCES/conman-0.2.7-num_threads.patch new file mode 100644 index 0000000..2a8aa64 --- /dev/null +++ b/SOURCES/conman-0.2.7-num_threads.patch @@ -0,0 +1,11 @@ +diff -urp conman-0.2.7.orig/server-ipmi.c conman-0.2.7/server-ipmi.c +--- conman-0.2.7.orig/server-ipmi.c 2011-04-22 01:23:49.000000000 +0200 ++++ conman-0.2.7/server-ipmi.c 2014-10-20 18:10:52.915756862 +0200 +@@ -95,6 +95,7 @@ void ipmi_init(int num_consoles) + return; + } + num_threads = ((num_consoles - 1) / IPMI_ENGINE_CONSOLES_PER_THREAD) + 1; ++ num_threads = MIN(num_threads, IPMICONSOLE_THREAD_COUNT_MAX); + + if (ipmiconsole_engine_init(num_threads, 0) < 0) { + log_err(0, "Unable to start IPMI SOL engine"); diff --git a/SOURCES/conman.service b/SOURCES/conman.service index 2d9a34a..4ef2d49 100644 --- a/SOURCES/conman.service +++ b/SOURCES/conman.service @@ -4,7 +4,10 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/conmand -c /etc/conman.conf +# For installations with large number of users, raise the limit +# of open file descriptors: +#LimitNOFILE=10000 +ExecStart=/usr/sbin/conmand -c /etc/conman.conf [Install] WantedBy=multi-user.target diff --git a/SPECS/conman.spec b/SPECS/conman.spec index 496990b..9168218 100644 --- a/SPECS/conman.spec +++ b/SPECS/conman.spec @@ -1,6 +1,6 @@ Name: conman Version: 0.2.7 -Release: 8%{?dist} +Release: 12%{?dist} Summary: ConMan - The Console Manager Group: Applications/System @@ -11,6 +11,7 @@ Source1: %{name}.service Source2: %{name}.logrotate Patch1: conman-0.2.5-openfiles.patch Patch2: conman-0.2.5-strftime.patch +Patch3: conman-0.2.7-num_threads.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: logrotate @@ -19,6 +20,7 @@ Requires(preun): systemd-units Requires(postun): systemd-units BuildRequires: tcp_wrappers BuildRequires: systemd-units +BuildRequires: freeipmi-devel %description ConMan is a serial console management program designed to support a large @@ -37,6 +39,7 @@ Its features include: %setup -q %patch1 -b .openfiles -p1 %patch2 -b .strftime -p1 +%patch3 -b .num_threads -p1 %build # not really lib material, more like share @@ -65,8 +68,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}.old # examples don't belong in datadir... rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/examples -# these shouldn't be executable -chmod -x $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +## these shouldn't be executable +#chmod -x $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +# rhel7 uses systemd instead of sysV init, /etc/sysconfig/conman +# is not used. Remove it to reduce user's confusion: +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +rmdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig # adjust perms on main config file chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf @@ -108,7 +115,8 @@ fi %doc AUTHORS ChangeLog COPYING FAQ NEWS %doc share/examples %config(noreplace) %{_sysconfdir}/%{name}.conf -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +# rhel7 does not use this file: +#%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_unitdir}/%{name}.service %{_localstatedir}/log/%{name} @@ -119,6 +127,24 @@ fi %{_mandir}/*/* %changelog +* Fri Jul 17 2015 Denys Vlasenko - 0.2.7-12 +- Remove unused /etc/sysconfig/conman. +- Resolves: rhbz#1244219. + +* Fri Jul 17 2015 Denys Vlasenko - 0.2.7-11 +- Ensure that num_threads <= IPMICONSOLE_THREAD_COUNT_MAX. +- Resolves: rhbz#1244189. + +* Wed Jul 1 2015 Denys Vlasenko - 0.2.7-10 +- Enable IPMI feature. +- Resolves: rhbz#1084116. + +* Wed Apr 8 2015 Denys Vlasenko - 0.2.7-9 +- Added commented-out "LimitNOFILE=" directive to conman.service. +- This is systemd-esque way to change process limits for serivces. +- Also and a comment when to use it. +- Resolves: rhbz#1035228. + * Fri Jan 24 2014 Daniel Mach - 0.2.7-8 - Mass rebuild 2014-01-24