From 5e7490b949e87ea8bb1617ff6c3de623b5a976a7 Mon Sep 17 00:00:00 2001 From: John Meneghini Date: Thu, 10 Aug 2023 17:34:08 -0400 Subject: [PATCH] Clean up spec file Changes recommended by rpmlint to clean up the spec file. JIRA: https://issues.redhat.com/browse/RHEL-1147 Signed-off-by: John Meneghini --- nvme-cli.spec | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/nvme-cli.spec b/nvme-cli.spec index 3fbc282..e44175b 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -53,11 +53,6 @@ nvme-cli provides NVM-Express user space tooling for Linux. %install %meson_install -# hostid and hostnqn are supposed to be unique per machine. We obviously -# can't package them. -#rm -f %{buildroot}%{_sysconfdir}/nvme/hostid -#rm -f %{buildroot}%{_sysconfdir}/nvme/hostnqn - # Do not install the dracut rule yet. See rhbz 1742764 # Do we want to keep this here? Now that we have boot support for nvme/fc + tcp? rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf @@ -89,19 +84,19 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme %post if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then - echo $(nvme gen-hostnqn) > %{_sysconfdir}/nvme/hostnqn + echo $(nvme gen-hostnqn) > %{_sysconfdir}/nvme/hostnqn fi if [ ! -s %{_sysconfdir}/nvme/hostid ]; then echo $(nvme show-hostnqn | sed 's/^.*uuid://') > %{_sysconfdir}/nvme/hostid fi - # apply udev and systemd changes that we did - if [ $1 -eq 1 ]; then - systemctl enable nvmefc-boot-connections - fi - systemctl daemon-reload - udevadm control --reload-rules && udevadm trigger - exit 0 + # apply udev and systemd changes that we did + if [ $1 -eq 1 ]; then + systemctl enable nvmefc-boot-connections + fi + systemctl daemon-reload + udevadm control --reload-rules && udevadm trigger + exit 0 fi %changelog