Merge pull request #5299 from M4rtinK/master-remove-instperf

Remove instperf
rhinstaller · Nov 9, 2023 · bed2e8b · bed2e8b
2 parents 6f793d0 + 359c9e7
commit bed2e8b
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 86 deletions.
diff --git a/anaconda.spec.in b/anaconda.spec.in
@@ -406,7 +406,6 @@ rm -rf \
 %license COPYING
 %{_unitdir}/*
 %{_prefix}/lib/systemd/system-generators/*
-%{_bindir}/instperf
 %{_bindir}/anaconda-disable-nm-ibft-plugin
 %{_bindir}/anaconda-nm-disable-autocons
 %{_sbindir}/anaconda

diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am
@@ -24,7 +24,6 @@ dist_systemd_DATA = anaconda.service \
                     anaconda.target \
                     anaconda-tmux@.service \
                     anaconda-shell@.service \
-                    instperf.service \
                     anaconda-sshd.service \
                     anaconda-nm-config.service \
                     anaconda-nm-disable-autocons.service \

diff --git a/data/systemd/anaconda-direct.service b/data/systemd/anaconda-direct.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=the anaconda installation program
-Wants=instperf.service rsyslog.service systemd-udev-settle.service NetworkManager.service
-After=instperf.service rsyslog.service systemd-udev-settle.service NetworkManager.service anaconda-sshd.service
+Wants=rsyslog.service systemd-udev-settle.service NetworkManager.service
+After=rsyslog.service systemd-udev-settle.service NetworkManager.service anaconda-sshd.service
 Requires=anaconda.service
 ConditionPathIsDirectory=|/sys/hypervisor/s390
 ConditionKernelCommandLine=|inst.notmux

diff --git a/data/systemd/anaconda-pre.service b/data/systemd/anaconda-pre.service
@@ -4,7 +4,6 @@ Description=pre-anaconda logging service
 Requires=basic.target
 After=basic.target
 Before=anaconda.target
-Wants=instperf.service
 Wants=rsyslog.service
 Wants=systemd-udev-settle.service
 Wants=NetworkManager.service

diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target
@@ -3,7 +3,6 @@ Description=Anaconda System Services
 Requires=basic.target
 After=basic.target
 AllowIsolate=yes
-Wants=instperf.service
 Wants=rsyslog.service
 Wants=systemd-udev-settle.service
 Wants=NetworkManager.service

diff --git a/data/systemd/instperf.service b/data/systemd/instperf.service
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -20,10 +20,9 @@ dist_scripts_SCRIPTS = run-anaconda anaconda-pre-log-gen log-capture start-modul
 
 dist_noinst_SCRIPTS  = makeupdates makebumpver
 
-dist_bin_SCRIPTS = anaconda-cleanup instperf anaconda-disable-nm-ibft-plugin \
+dist_bin_SCRIPTS = anaconda-cleanup anaconda-disable-nm-ibft-plugin \
                    anaconda-nm-disable-autocons
 
 miscdir = $(datadir)/$(PACKAGE_NAME)
-dist_misc_DATA = instperf.p
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/scripts/instperf b/scripts/instperf
diff --git a/scripts/instperf.p b/scripts/instperf.p