add /etc/sysconfig/rshim for setting $OPTIONS
Also update rshim.service to source this file and get the $OPTIONS environment variable. Resolves: rhbz#1960060
This commit is contained in:
parent
29013ddd5d
commit
f11eddcc74
24
rshim-sysconfig.patch
Normal file
24
rshim-sysconfig.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From 37b1523b39d7fb0d58d57b8f58c943055b1e83e2 Mon Sep 17 00:00:00 2001
|
||||
From: Jeffrey Bastian <jbastian@redhat.com>
|
||||
Date: Tue, 6 Apr 2021 14:24:16 -0500
|
||||
Subject: [PATCH] add rshim sysconfig file for setting
|
||||
|
||||
---
|
||||
rshim.service | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/rshim.service b/rshim.service
|
||||
index 84f0e2f49eba..7539133f869c 100644
|
||||
--- a/rshim.service
|
||||
+++ b/rshim.service
|
||||
@@ -9,6 +9,7 @@ After=network.target
|
||||
[Service]
|
||||
Restart=always
|
||||
Type=forking
|
||||
+EnvironmentFile=-/etc/sysconfig/rshim
|
||||
ExecStart=-/usr/sbin/rshim $OPTIONS
|
||||
KillMode=control-group
|
||||
|
||||
--
|
||||
2.26.3
|
||||
|
||||
15
rshim.spec
15
rshim.spec
@ -4,13 +4,14 @@
|
||||
|
||||
Name: rshim
|
||||
Version: 2.0.4
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: User-space driver for Mellanox BlueField SoC
|
||||
|
||||
License: GPLv2
|
||||
|
||||
URL: https://github.com/mellanox/rshim-user-space
|
||||
Source0: https://github.com/Mellanox/rshim-user-space/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: rshim-sysconfig.patch
|
||||
|
||||
BuildRequires: gcc, autoconf, automake, make
|
||||
BuildRequires: pkgconfig(libpci), pkgconfig(libusb-1.0), pkgconfig(fuse)
|
||||
@ -27,6 +28,7 @@ via the virtual console or network interface.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0 -p1 -b .sysconfig
|
||||
|
||||
%build
|
||||
./bootstrap.sh
|
||||
@ -36,6 +38,12 @@ via the virtual console or network interface.
|
||||
%install
|
||||
%make_install
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
||||
cat > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rshim <<EOF
|
||||
# Command-line options for rshim
|
||||
OPTIONS=""
|
||||
EOF
|
||||
|
||||
%post
|
||||
%systemd_post rshim.service
|
||||
|
||||
@ -48,11 +56,16 @@ via the virtual console or network interface.
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/rshim
|
||||
%{_sbindir}/rshim
|
||||
%{_unitdir}/rshim.service
|
||||
%{_mandir}/man8/rshim.8.gz
|
||||
|
||||
%changelog
|
||||
* Tue Apr 20 2021 Jeff Bastian <jbastian@redhat.com> - 2.0.4-6
|
||||
- add sysconfig/rshim file and update rshim.service to source it
|
||||
- Resolves: rhbz#1960060
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.4-5
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user