#50813 Issue 50812 - dscontainer executable should be placed under /usr/libexec/dirsrv/
Merged a month ago by mreynolds. Opened a month ago by mreynolds.
mreynolds/389-ds-base issue50812  into  master

@@ -46,6 +46,6 @@ 

  #USER dirsrv

  

  HEALTHCHECK --start-period=5m --timeout=5s --interval=5s --retries=2 \

-   CMD /usr/sbin/dscontainer -H

+   CMD /usr/libexec/dirsrv/dscontainer -H

  

- CMD [ "/usr/sbin/dscontainer", "-r" ]

+ CMD [ "/usr/libexec/dirsrv/dscontainer", "-r" ]

@@ -76,7 +76,7 @@ 

  # USER dirsrv

  

  HEALTHCHECK --start-period=5m --timeout=5s --interval=5s --retries=2 \

-     CMD /usr/sbin/dscontainer -H

+     CMD /usr/libexec/dirsrv/dscontainer -H

  

- CMD [ "/usr/sbin/dscontainer", "-r" ]

+ CMD [ "/usr/libexec/dirsrv/dscontainer", "-r" ]

  

@@ -69,4 +69,4 @@ 

  # here and ds should do the right thing if a non root user runs the server.

  # USER dirsrv

  

- CMD [ "/usr/sbin/dscontainer", "-r" ]

+ CMD [ "/usr/libexec/dirsrv/dscontainer", "-r" ]

file modified
+1 -1

@@ -808,7 +808,7 @@ 

  %{_mandir}/man8/dsctl.8.gz

  %{_sbindir}/dsidm

  %{_mandir}/man8/dsidm.8.gz

- %{_sbindir}/dscontainer

+ %{_libexecdir}/%{pkgname}/dscontainer

  

  %files -n cockpit-389-ds -f cockpit.list

  %{_datarootdir}/metainfo/389-console/org.port389.cockpit_console.metainfo.xml

file modified
+3 -1

@@ -63,7 +63,6 @@ 

              'cli/dsconf',

              'cli/dscreate',

              'cli/dsidm',

-             'cli/dscontainer',

              ]),

          ('/usr/share/man/man8', [

              'man/dsctl.8',

@@ -71,6 +70,9 @@ 

              'man/dscreate.8',

              'man/dsidm.8',

              ]),

+         ('/usr/libexec/dirsrv/', [

+             'cli/dscontainer',

+             ]),

      ],

  

      install_requires=[

Description:

dscontainer is not a user-runnable executable. Per packaging guidelines it should be placed under /usr/libexec/dirsrv/

relates: https://pagure.io/389-ds-base/issue/50812

Don't we need to change the dockerfiles too?

rebased onto 43172205e53aac1948f4a899a7ce11444710dd21

a month ago

Don't we need to change the dockerfiles too?

Umm, yes we do ;-)

Fixed, please review...

rebased onto 74557db

a month ago

Pull-Request has been merged by mreynolds

a month ago