Author: bluca
Date: Sat Feb 17 11:16:54 2007
New Revision: 122083
Modified:
packages/cooker/postfix/current/SOURCES/postfix-chroot.sh
packages/cooker/postfix/current/SPECS/postfix.spec
Log:
do not chroot spawn service
Modified: packages/cooker/postfix/current/SOURCES/postfix-chroot.sh
==============================================================================
--- packages/cooker/postfix/current/SOURCES/postfix-chroot.sh (original)
+++ packages/cooker/postfix/current/SOURCES/postfix-chroot.sh Sat Feb 17
11:16:54 2007
@@ -291,8 +291,8 @@
[ -n "${prunedeps##*$i*}" ] && copy ${i}
done
- # chroot master.cf change all lines except pipe, local, proxymap and
- # virtual
+ # chroot master.cf change all lines except pipe, local, proxymap,
+ # virtual and spawn
awk -v NEVER_CHROOT_PROGRAM="$NEVER_CHROOT_PROGRAM" \
-v NEVER_CHROOT_SERVICE="$NEVER_CHROOT_SERVICE" '
BEGIN { IFS="[ \t]+"; OFS="\t"; }
@@ -384,7 +384,7 @@
# defaults
CHROOT=0
-NEVER_CHROOT_PROGRAM='^(proxymap|local|pipe|virtual)$'
+NEVER_CHROOT_PROGRAM='^(proxymap|local|pipe|virtual|spawn)$'
NEVER_CHROOT_SERVICE='^cyrus$'
ALWAYS_CHROOT_PROGRAM='^$'
ALWAYS_CHROOT_SERVICE='^$'
Modified: packages/cooker/postfix/current/SPECS/postfix.spec
==============================================================================
--- packages/cooker/postfix/current/SPECS/postfix.spec (original)
+++ packages/cooker/postfix/current/SPECS/postfix.spec Sat Feb 17 11:16:54 2007
@@ -383,7 +383,7 @@
%if %{with chroot}
cp -p conf/master.cf conf/master.cf.chroot
-awk -v NEVER_CHROOT_PROGRAM='^(proxymap|local|pipe|virtual)$' \
+awk -v NEVER_CHROOT_PROGRAM='^(proxymap|local|pipe|virtual|spawn)$' \
-v NEVER_CHROOT_SERVICE='^cyrus$' '
BEGIN { IFS="[ \t]+"; OFS="\t"; }
/^#/ { print; next; }
@@ -624,6 +624,13 @@
echo
"============================================================================"
echo
fi
+# disable chroot of spawn service in /etc/sysconfig/postfix, but do it only
once and only if user did not
+# modify /etc/sysconfig/postfix manually
+if grep -qs "^NEVER_CHROOT_PROGRAM='^(proxymap|local|pipe|virtual)$'$"
/etc/sysconfig/postfix; then
+ if ! grep -qs
"^NEVER_CHROOT_PROGRAM='^(proxymap|local|pipe|virtual|spawn)$'$"
/usr/sbin/postfix-chroot.sh; then
+ perl -pi -e
"s/^NEVER_CHROOT_PROGRAM=.*\$/NEVER_CHROOT_PROGRAM=\'^(proxymap|local|pipe|virtual|spawn)\\\$\'/"
/etc/sysconfig/postfix
+ fi
+fi
%post
# we don't have these maps anymore as separate packages/plugins:
