Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for EL6 (init scripts) #33

Merged
merged 3 commits into from
Jul 25, 2024

Conversation

jouvin
Copy link
Contributor

@jouvin jouvin commented Mar 21, 2024

No description provided.

@jouvin jouvin requested review from jrha and stdweird March 21, 2024 14:44
@jrha jrha added this to the 24.3 milestone Mar 27, 2024
- Presence of init scripts causes a conflict on RHEL9 if installing also the chkconfig package

Fixes quattor#27
- Use of /var/run generates a warningin EL9
- Supported since EL7 where /var/run is a symlink to /run
@jouvin
Copy link
Contributor Author

jouvin commented Apr 2, 2024

Tested successfully at IJCLab (EL9).

@stdweird
Copy link
Member

stdweird commented Apr 3, 2024

this removes support for init.d completly. is this ok, also for el7? and why don't you actually remove the script in src/main/daemon?

@aka7
Copy link

aka7 commented Apr 15, 2024

from what I've noticed, building a package with this PR, I see chkconfig dependency is removed but /etc/init.d/cdp-listend still being installed. So therefore /etc/init.d dir is being created and I still see the error if chkconfig package is installed later.

rpm -qpl target/rpm/cdp-listend/RPMS/noarch/cdp-listend-23.9.0-rc2_SNAPSHOT20240415105908.noarch.rpm
/etc/cdp-listend.conf
/etc/cron.d/check-cdp-listend.cron
/etc/init.d/cdp-listend
/etc/logrotate.d/cdp-listend
/usr/lib/systemd/system-preset/80-cdp-listend.preset
/usr/lib/systemd/system/cdp-listend.service
/usr/sbin/cdp-listend
/usr/sbin/check-cdp-listend
/usr/share/doc/cdp-listend-23.9.0-rc2-SNAPSHOT/ChangeLog
/usr/share/quattor/check-cdp-listend

so don't you also need to update pom.xml?

diff --git a/pom.xml b/pom.xml
index 2e954ae..480af7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,16 +129,6 @@
               <mapping>
                 <sources>
                   <source>
-                    <location>${project.build.directory}/daemon</location>
-                  </source>
-                </sources>
-                <directory>/etc/init.d</directory>
-                <filemode>755</filemode>
-                <directoryIncluded>false</directoryIncluded>
-              </mapping>
-              <mapping>
-                <sources>
-                  <source>
                     <location>${project.build.directory}/systemd/${project.artifactId}.service</location>
                   </source>
                 </sources>

with this change, it does not have any reference to /etc/init.d/cdp-listend in the resulting built rpm.

@jouvin
Copy link
Contributor Author

jouvin commented Apr 16, 2024

@aka7 I confirm your findings. According to what I see on the machines I deployed with this PR the path doesn't seem to be in the rpm anymore but better to clean it. I'll do it.

@jouvin
Copy link
Contributor Author

jouvin commented Apr 17, 2024

@aka7 I just pushed the suggested cleanup in pom.xml

@jrha jrha merged commit 2f6f090 into quattor:master Jul 25, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants