[pve-devel] [PATCH ceph] ceph-base: really don't install 'ceph' init script

[pve-devel] [PATCH ceph] ceph-base: really don't install 'ceph' init script

[Fabian Grünbichler]

remove the dh_installinit call in d/rules, the existing patch was incomplete

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 ...ip-legacy-init.d-ceph-script-anymore.patch | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/patches/0025-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch b/patches/0025-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch
index 846f75c331..fa18d63b95 100644
--- a/patches/0025-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch
+++ b/patches/0025-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch
@@ -11,20 +11,35 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  debian/ceph-base.maintscript | 1 +
  2 files changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/debian/ceph-base.install b/debian/ceph-base.install
-index db28aaa1fa1..425933ee157 100644
---- a/debian/ceph-base.install
-+++ b/debian/ceph-base.install
+Index: ceph-19.2.3.tmp/debian/ceph-base.install
+===================================================================
+--- ceph-19.2.3.tmp.orig/debian/ceph-base.install
++++ ceph-19.2.3.tmp/debian/ceph-base.install
 @@ -1,4 +1,3 @@
 -etc/init.d/ceph
  usr/lib/systemd/system/ceph-crash.service
  usr/bin/ceph-crash
  usr/bin/ceph-debugpack
-diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
-index 196dc084135..aa257a14632 100644
---- a/debian/ceph-base.maintscript
-+++ b/debian/ceph-base.maintscript
+Index: ceph-19.2.3.tmp/debian/ceph-base.maintscript
+===================================================================
+--- ceph-19.2.3.tmp.orig/debian/ceph-base.maintscript
++++ ceph-19.2.3.tmp/debian/ceph-base.maintscript
 @@ -1,2 +1,3 @@
  rm_conffile /etc/logrotate.d/ceph
  rm_conffile /etc/logrotate.d/ceph.logrotate
 +rm_conffile /etc/init.d/ceph 19.2.2-pve6~ ceph-base
+Index: ceph-19.2.3.tmp/debian/rules
+===================================================================
+--- ceph-19.2.3.tmp.orig/debian/rules
++++ ceph-19.2.3.tmp/debian/rules
+@@ -94,8 +94,6 @@ override_dh_installinit:
+ 	install -m0644 etc/default/ceph debian/ceph-common/etc/default/
+ 	install -d -m0755 debian/ceph-common/usr/lib/tmpfiles.d
+ 	install -m 0644 -D systemd/ceph.tmpfiles.d debian/ceph-common/usr/lib/tmpfiles.d/ceph.conf
+-
+-	dh_installinit -p ceph-base --name ceph --no-start
+ 	dh_installinit -p radosgw --no-start
+ 
+ override_dh_installsystemd:
+ 	# Only enable and start systemd targets
+ 	dh_installsystemd --no-stop-on-upgrade --no-restart-after-upgrade -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH ceph] ceph-base: really don't install 'ceph' init script

[Thomas Lamprecht]

On Fri, 01 Aug 2025 10:37:31 +0200, Fabian Grünbichler wrote:
> remove the dh_installinit call in d/rules, the existing patch was incomplete
> 
>

Argh, I saw the maintscript being called and removing it and thought that
should have done it.. btw. do we need to increase that version for the
maintscript now again, or?

Applied, thanks!

[1/1] ceph-base: really don't install 'ceph' init script
      commit: 75b006c616cafa23e59e8abe939eabc7a080dfa5


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] applied: [PATCH ceph] ceph-base: really don't install 'ceph' init script

[Fabian Grünbichler]

On August 1, 2025 10:54 am, Thomas Lamprecht wrote:
> On Fri, 01 Aug 2025 10:37:31 +0200, Fabian Grünbichler wrote:
>> remove the dh_installinit call in d/rules, the existing patch was incomplete
>> 
>>
> 
> Argh, I saw the maintscript being called and removing it and thought that
> should have done it.. btw. do we need to increase that version for the
> maintscript now again, or?

yes, I think so.


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH ceph] ceph-base: really don't install 'ceph' init script

[Thomas Lamprecht]

Am 01.08.25 um 10:37 schrieb Fabian Grünbichler:
> remove the dh_installinit call in d/rules, the existing patch was incomplete
> 

For the record, this turned out to be unnecessary, it really was already
removed but now we also got the packages for Ceph Squid, which is our
baseline for PVE 9, also uploaded to the PVE repo, but we did not upload
all updates there since the initial upload, so while the packages in the
ceph repo itself were alright, the ones pulled from just pve-test were
a bit dated and still included the file.

I probably keep this change to the patch as it avoids confusion
potential and the resulting packages are 1:1 the same w.r.t. config
or unit files.


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel