cmake: execute daemon-reload and restart postinst in deb #10899
Conversation
aminvakil
requested review from
fujimotos,
niedbalski,
patrick-stephens and
celalettin1286
as code owners
|
Initial attempt on |
aminvakil
force-pushed
the
debian_restart_postinst
branch
from
40165cb to
9c593e6
Compare
|
I've commented anything other debian 11 and debian 12 and it's not working. |
aminvakil
changed the title
aminvakil
force-pushed
the
debian_restart_postinst
branch
2 times, most recently
from
911efe8 to
b26ddd2
Compare
|
This has broken other stuff Currently it is: Also |
aminvakil
force-pushed
the
debian_restart_postinst
branch
from
b26ddd2 to
e266230
Compare
|
It's correct now. It restarts service when it's already started, it does not start the service if it has not been started already. For testing with to in CMakelists.txt, build package and test it. |
|
With in CMakelists.txt |
aminvakil
changed the title
|
There is another issue in It's ready for review now. |
aminvakil
force-pushed
the
debian_restart_postinst
branch
from
ea13cfe to
716357e
Compare
|
I do not know the policies for this repository, but I had Gemini's help for creating this PR, but I've tested final deb file on a debian bullseye as stated in my comments. |
|
Note to myself: Is this the correct approach or should I use |
aminvakil
force-pushed
the
debian_restart_postinst
branch
from
716357e to
e0d552b
Compare
|
Failing tests are irrelevant to this PR: There is also windows fix which is failing. |
aminvakil
changed the title
aminvakil
changed the title
aminvakil
force-pushed
the
debian_restart_postinst
branch
2 times, most recently
from
8d80332 to
be18f35
Compare
|
Can you rebase? The awscli issue is related to the arm image but it's resolved in master |
Yep, I saw that and already rebased. |
aminvakil
force-pushed
the
debian_restart_postinst
branch
from
be18f35 to
a7fd450
Compare
|
Failing tests are irrelevant to this PR. |
Signed-off-by: Amin Vakil <info@aminvakil.com>
Signed-off-by: Amin Vakil <info@aminvakil.com>
Signed-off-by: Amin Vakil <info@aminvakil.com>
Signed-off-by: Amin Vakil <info@aminvakil.com>
aminvakil
force-pushed
the
debian_restart_postinst
branch
from
85f67d9 to
3c3a743
Compare
WalkthroughIntroduces a templated Debian post-install script and updates CMake packaging flow to generate it via configure_file. Accumulates package control extras using list(APPEND), ensuring generated postinst and existing prerm are included. Replaces inline file writes with a variable-based command list for postinst content. Changes
Sequence Diagram(s)sequenceDiagram
autonumber
participant Dev as Developer
participant CMake as CMake (configure)
participant CFG as configure_file
participant CPack as CPack (package)
participant dpkg as dpkg (install)
participant Post as postinst script
participant systemd as systemd
Dev->>CMake: Configure project
CMake->>CFG: Generate scripts/postinst from cpack/debian/postinst.in
Note right of CFG: Inject LDCONFIG_SCRIPT_CMDS into template
CMake->>CPack: Set CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA (append postinst, prerm)
Dev->>CPack: Build Debian package
dpkg->>Post: Run postinst (configure/abort-*)
Post->>Post: Execute placeholder post-install commands
alt systemd available
Post->>systemd: daemon-reload (quiet)
Post->>systemd: restart FLB_OUT_NAME (best-effort)
else no systemd
Note right of Post: Skip daemon-reload/restart
end
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Suggested reviewers
Poem
Pre-merge checks and finishing touches✅ Passed checks (3 passed)
✨ Finishing touches🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
CMakeLists.txt (1)
1488-1501: Broken packaging when FLB_RUN_LDCONFIG=OFF (unconditional prerm reference) + missing scripts dir + wrong var name for template.
- prerm is always appended (Line 1500), but only created when FLB_RUN_LDCONFIG is ON.
- ${PROJECT_BINARY_DIR}/scripts/ may not exist before file(WRITE) and configure_file, causing failures.
- Variable name should match postinst.in’s @LDCONFIG_POSTINST_CMDS@.
Fix all in one go:
Apply this diff:
- set(LDCONFIG_SCRIPT_CMDS "") - if(FLB_RUN_LDCONFIG) - set(LDCONFIG_DIR ${FLB_INSTALL_LIBDIR}) - set(LDCONFIG_SCRIPT_CMDS " + # Ensure scripts directory exists for generated maintainer scripts + file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/scripts") + + # Content injected into postinst when ldconfig is enabled + set(LDCONFIG_POSTINST_CMDS "") + if(FLB_RUN_LDCONFIG) + set(LDCONFIG_DIR "${FLB_INSTALL_LIBDIR}") + set(LDCONFIG_POSTINST_CMDS " mkdir -p /etc/ld.so.conf.d echo \"${LDCONFIG_DIR}\" > /etc/ld.so.conf.d/libfluent-bit.conf ldconfig ") - file(WRITE ${PROJECT_BINARY_DIR}/scripts/prerm " + file(WRITE "${PROJECT_BINARY_DIR}/scripts/prerm" " rm -f -- /etc/ld.so.conf.d/libfluent-bit.conf ldconfig ") - list(APPEND CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/scripts/postinst;${PROJECT_BINARY_DIR}/scripts/prerm") + # Ensure executable bit for dpkg maintainer script + execute_process(COMMAND "${CMAKE_COMMAND}" -E chmod +x "${PROJECT_BINARY_DIR}/scripts/prerm") + list(APPEND CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/scripts/prerm") endif(FLB_RUN_LDCONFIG)
🧹 Nitpick comments (2)
cpack/debian/postinst.in (2)
4-9: Limit service actions to configure; avoid try-restart on abort- phases.*Running daemon-reload/try-restart during abort-* is unnecessary and unexpected for Debian maintainer scripts. Keep these to the configure phase.
Apply this diff:
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then +if [ "$1" = "configure" ] ; then if [ -d /run/systemd/system ]; then systemctl --system daemon-reload >/dev/null || true systemctl try-restart @FLB_OUT_NAME@.service >/dev/null || true fi fi
5-8: Prefer deb-systemd-invoke to systemctl for maintainer scripts.deb-systemd-invoke handles non-systemd environments and policy nuances better than calling systemctl directly.
Consider:
- systemctl --system daemon-reload >/dev/null || true - systemctl try-restart @FLB_OUT_NAME@.service >/dev/null || true + if command -v deb-systemd-invoke >/dev/null 2>&1; then + deb-systemd-invoke --system daemon-reload >/dev/null || true + deb-systemd-invoke try-restart @FLB_OUT_NAME@.service >/dev/null || true + else + systemctl --system daemon-reload >/dev/null || true + systemctl try-restart @FLB_OUT_NAME@.service >/dev/null || true + fi
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
CMakeLists.txt(2 hunks)cpack/debian/postinst.in(1 hunks)
🧰 Additional context used
🧠 Learnings (4)
📚 Learning: 2025-09-14T17:23:01.225Z
Learnt from: aminvakil
PR: fluent/fluent-bit#10844
File: src/CMakeLists.txt:664-668
Timestamp: 2025-09-14T17:23:01.225Z
Learning: Many popular Debian packages like nginx and fail2ban install both init.d scripts and systemd services simultaneously, following standard Debian packaging practices where systemd automatically prefers the native service file over the SysV init script when both are present.
Applied to files:
CMakeLists.txt
📚 Learning: 2025-08-31T12:46:11.940Z
Learnt from: ThomasDevoogdt
PR: fluent/fluent-bit#9277
File: .github/workflows/pr-compile-check.yaml:147-151
Timestamp: 2025-08-31T12:46:11.940Z
Learning: In fluent-bit CMakeLists.txt, the system library preference flags are defined as FLB_PREFER_SYSTEM_LIB_ZSTD and FLB_PREFER_SYSTEM_LIB_KAFKA with the FLB_ prefix.
Applied to files:
CMakeLists.txt
📚 Learning: 2025-08-31T12:46:11.940Z
Learnt from: ThomasDevoogdt
PR: fluent/fluent-bit#9277
File: .github/workflows/pr-compile-check.yaml:147-151
Timestamp: 2025-08-31T12:46:11.940Z
Learning: In fluent-bit, the correct CMake flag for using system librdkafka is `FLB_PREFER_SYSTEM_LIB_KAFKA=ON`.
Applied to files:
CMakeLists.txt
📚 Learning: 2025-09-14T09:46:09.531Z
Learnt from: aminvakil
PR: fluent/fluent-bit#10844
File: conf/fluent-bit:13-15
Timestamp: 2025-09-14T09:46:09.531Z
Learning: For fluent-bit Debian packaging, /opt/fluent-bit/bin/ is the appropriate installation path since the package may be installed from non-official Debian sources, making /opt compliant with FHS for optional software packages.
Applied to files:
CMakeLists.txt
| configure_file( | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/cpack/debian/postinst.in | ||
| ${PROJECT_BINARY_DIR}/scripts/postinst | ||
| ) |
There was a problem hiding this comment.
postinst generation lacks executable bit; ensure correct perms and use the corrected variable.
configure_file writes 0644 by default; Debian maintainer scripts must be executable. Also switch to the corrected LDCONFIG_POSTINST_CMDS.
Apply this diff:
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/cpack/debian/postinst.in
- ${PROJECT_BINARY_DIR}/scripts/postinst
- )
+ configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cpack/debian/postinst.in"
+ "${PROJECT_BINARY_DIR}/scripts/postinst"
+ )
+ execute_process(COMMAND "${CMAKE_COMMAND}" -E chmod +x "${PROJECT_BINARY_DIR}/scripts/postinst")📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| configure_file( | |
| ${CMAKE_CURRENT_SOURCE_DIR}/cpack/debian/postinst.in | |
| ${PROJECT_BINARY_DIR}/scripts/postinst | |
| ) | |
| configure_file( | |
| "${CMAKE_CURRENT_SOURCE_DIR}/cpack/debian/postinst.in" | |
| "${PROJECT_BINARY_DIR}/scripts/postinst" | |
| ) | |
| execute_process( | |
| COMMAND "${CMAKE_COMMAND}" -E chmod +x | |
| "${PROJECT_BINARY_DIR}/scripts/postinst" | |
| ) |
🤖 Prompt for AI Agents
In CMakeLists.txt around lines 1503-1506, the postinst file produced by
configure_file is created with default 0644 and must be executable and the
variable name should be LDCONFIG_POSTINST_CMDS; after the configure_file call,
add a file(SET_PERMISSIONS ${PROJECT_BINARY_DIR}/scripts/postinst OWNER_READ
OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) to
give the script the executable bit, and update any references to the old
variable to use LDCONFIG_POSTINST_CMDS.
| list(APPEND CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/scripts/postinst;${PROJECT_BINARY_DIR}/scripts/prerm") | ||
|
|
There was a problem hiding this comment.
🛠️ Refactor suggestion | 🟠 Major
Avoid duplicate appends and unconditional prerm reference.
Append postinst once, and only append prerm when it exists (already done inside the FLB_RUN_LDCONFIG block above).
Apply this diff:
- list(APPEND CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/scripts/postinst;${PROJECT_BINARY_DIR}/scripts/prerm")
+ list(APPEND CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/scripts/postinst")📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| list(APPEND CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/scripts/postinst;${PROJECT_BINARY_DIR}/scripts/prerm") | |
| list(APPEND CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/scripts/postinst") |
🤖 Prompt for AI Agents
In CMakeLists.txt around lines 1508-1509, the current list(APPEND
CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA ...) unconditionally appends both
postinst and prerm which causes duplicate appends of postinst and incorrectly
references prerm even when not present; change this to only append postinst here
(and ensure it is appended only once overall) and remove the unconditional prerm
entry so prerm is appended only inside the existing FLB_RUN_LDCONFIG block where
its presence is checked.
| @@ -0,0 +1,9 @@ | |||
| #!/bin/sh | |||
| set -e | |||
| @LDCONFIG_POSTINST_CMDS@ | |||
There was a problem hiding this comment.
🧩 Analysis chain
Fix variable name mismatch: template expects LDCONFIG_POSTINST_CMDS but CMake sets LDCONFIG_SCRIPT_CMDS.
As written, ldconfig commands will never be injected into postinst. Align the variable names (I suggest fixing CMake to set LDCONFIG_POSTINST_CMDS).
Run this to confirm the mismatch:
🏁 Script executed:
#!/bin/bash
rg -n -C1 'LDCONFIG_.*CMDS' cpack/debian/postinst.in CMakeLists.txtLength of output: 518
Align CMake variable with postinst template
cpack/debian/postinst.in uses @LDCONFIG_POSTINST_CMDS@ but CMakeLists.txt defines LDCONFIG_SCRIPT_CMDS; rename the CMake variable to LDCONFIG_POSTINST_CMDS so the ldconfig commands are injected.
🤖 Prompt for AI Agents
In cpack/debian/postinst.in around line 3 the template uses
@LDCONFIG_POSTINST_CMDS@ but the CMakeLists.txt defines LDCONFIG_SCRIPT_CMDS;
rename the CMake variable in CMakeLists.txt from LDCONFIG_SCRIPT_CMDS to
LDCONFIG_POSTINST_CMDS so the ldconfig commands are injected into the postinst
template, updating any places that set or append to that variable accordingly.
Follow up to #10844 and #8341 and #8330.
Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.
Summary by CodeRabbit
New Features
Chores