--- rpms/e-smith-base/sme10/e-smith-base.spec 2020/11/18 20:26:17 1.67 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2020/11/25 14:27:44 1.68 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.66 2020/11/18 03:58:05 jpp Exp $ +# $Id: e-smith-base.spec,v 1.67 2020/11/18 20:26:17 jpp Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 55 +%define release 56 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -51,6 +51,7 @@ Patch37: e-smith-base-5.8.0-bz11094-raid Patch38: e-smith-base-5.8.0-bz11174-preset.patch Patch39: e-smith-base-5.8.0-bz11177-systemd.patch Patch40: e-smith-base-5.8.0-bz2408-bz11100-dhcpd-systemd-and-log.patch +Patch41: e-smith-base-5.8.0-fix_raid_detection.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: pwauth @@ -101,6 +102,9 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Wed Nov 25 2020 Chris Sansom-Ninnes 5.8.0-56.sme +- Fix RAID detection regex for disk redundancy screen [SME: 10918] + * Wed Nov 18 2020 Jean-Philipe Pialasse 5.8.0-55.sme - add Install part of systemd unit [SME: 11100] @@ -2061,6 +2065,7 @@ mkdir -p root/usr/lib/systemd/system/dhc rm root/service/dhcpd rm -rf root/var/service/dhcpd rm root/etc/rc.d/init.d/supervise/dhcpd +%patch41 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \