From 790f7d201a226bc1dfbf24b6b22d31f35867bb76 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 4 Nov 2025 08:11:39 -0600 Subject: [PATCH] Revert "Adjusted install scriptlets to give more time for shutting down database" Code freeze for releases so will mark this as after-release. This reverts commit f2b3ca35e98427a4d02dad8260a9ca118b4447f5. --- packaging/common/cfengine-hub/postinstall.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packaging/common/cfengine-hub/postinstall.sh b/packaging/common/cfengine-hub/postinstall.sh index a15bedcb6..6660d23c3 100644 --- a/packaging/common/cfengine-hub/postinstall.sh +++ b/packaging/common/cfengine-hub/postinstall.sh @@ -1060,10 +1060,7 @@ if [ -n "$httpds" ]; then fi fi -# wait 5 minutes for smart shutdown to happen, on slower machines it might take a while -if ! (cd /tmp && su cfpostgres -c "$PREFIX/bin/pg_ctl stop -D $PREFIX/state/pg/data --timeout=300 -m smart"); then - su cfpostgres -c "$PREFIX/bin/pg_ctl stop -D $PREFIX/state/pg/data --timeout=300 -m fast" -fi +(cd /tmp && su cfpostgres -c "$PREFIX/bin/pg_ctl stop -D $PREFIX/state/pg/data -m smart" || su cfpostgres -c "$PREFIX/bin/pg_ctl stop -D $PREFIX/state/pg/data -m fast") # Have to be careful here because httpd/php/bin wants to be root:root chown root:$MP_APACHE_USER $PREFIX/httpd/php