From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ceph] ceph-base: really don't install 'ceph' init script
Date: Fri, 1 Aug 2025 10:37:31 +0200 [thread overview]
Message-ID: <20250801083731.390635-1-f.gruenbichler@proxmox.com> (raw)
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
next reply other threads:[~2025-08-01 8:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-01 8:37 Fabian Grünbichler [this message]
2025-08-01 8:54 ` [pve-devel] applied: " Thomas Lamprecht
2025-08-01 8:57 ` Fabian Grünbichler
2025-08-01 11:16 ` [pve-devel] " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250801083731.390635-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.