diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2025-03-16 13:34:00 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2025-03-16 13:34:00 +0100 |
| commit | 0bbe5815fd94129767ec0072d1d7e5e7eff1a6e7 (patch) | |
| tree | 1b44e7d6fd8446f8c3e2fc8f1ef3af281d590fab /doc/ipmiutil.spec | |
| parent | 9641459c047738b492ab6002a9d38d286e237721 (diff) | |
| parent | 5ad8be875662e799ca8739e267b4879bb281a048 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'doc/ipmiutil.spec')
| -rw-r--r-- | doc/ipmiutil.spec | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec index c6b4db2..2d9d4af 100644 --- a/doc/ipmiutil.spec +++ b/doc/ipmiutil.spec @@ -3,7 +3,7 @@ # Copyright (c) 2012 Andy Cress # Name: ipmiutil -Version: 3.1.9 +Version: 3.2.1 Release: 1%{?dist} Summary: Easy-to-use IPMI server management utilities License: BSD @@ -203,6 +203,9 @@ rm -rf %{buildroot} %if 0%{?req_systemd} %service_add_pre ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service %endif +if [ ! -f %{_datadir}/%{name}/ipmiutil.env ]; then + cp %{_datadir}/%{name}/ipmiutil.env.template %{_datadir}/%{name}/ipmiutil.env +fi %post /sbin/ldconfig @@ -217,9 +220,6 @@ scr_dir=%{_datadir}/%{name} if [ -x /bin/systemctl ] && [ -d %{unit_dir} ]; then # Replace if exists, append if not. # Use # as the sed delimiter to prevent handling slash in the path. - if [ ! -f %{_datadir}/%{name}/ipmiutil.env ]; then - cp %{_datadir}/%{name}/ipmiutil.env.template %{_datadir}/%{name}/ipmiutil.env - fi grep -q 'IINITDIR' %{_datadir}/%{name}/ipmiutil.env \ && sed -i 's#^IINITDIR=.*#IINITDIR=%{init_dir}#' %{_datadir}/%{name}/ipmiutil.env \ || echo "IINITDIR=%{init_dir}" >> %{_datadir}/%{name}/ipmiutil.env @@ -274,8 +274,9 @@ then # Capture a snapshot of IPMI sensor data once now for later reuse. sensorout=$vardir/sensor_out.txt if [ ! -f $sensorout ]; then - %{_bindir}/ipmiutil sensor -q >$sensorout || : - if [ $? -ne 0 ]; then + IPMIret=1 + %{_bindir}/ipmiutil sensor -q >$sensorout && IPMIret=0 + if [ $IPMIret -ne 0 ]; then # remove file if error, try again in ipmi_port on reboot. rm -f $sensorout fi |