From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 2/2] Core94: fix for dma when postfix is installed Date: Thu, 15 Oct 2015 11:59:22 +0100 Message-ID: <1444906762.18375.22.camel@ipfire.org> In-Reply-To: <1444904308-15139-2-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4423452751458552104==" List-Id: --===============4423452751458552104== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Hi, the sed command is a bit messy. You can also use a difference character as a delimiter for the two fields like @. That would look like this: sed -e "s(a)usr/bin/sendmail(a)usr/bin/sendmail.postfix(a)g" ... That makes it more readable. You can also use the & character in the second half to get the matched string from the first half. That would look like this: sed -e "s(a)usr/bin/sendmail@&.postfix@" ... ...which is even shorter. I will merge this because you version is working, too. -Michael On Thu, 2015-10-15 at 12:18 +0200, Alexander Marx wrote: > --- > config/rootfiles/core/94/update.sh | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/config/rootfiles/core/94/update.sh > b/config/rootfiles/core/94/update.sh > index 1b9eed7..7b645e9 100644 > --- a/config/rootfiles/core/94/update.sh > +++ b/config/rootfiles/core/94/update.sh > @@ -70,7 +70,13 @@ EOF > > fcrontab -z &>/dev/null > > -# dma files > +# DMA - reconfigure Postfix if exists > +if [ -e /etc/postfix/main.cf ]; then > + mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix > + /usr/sbin/alternatives --install /usr/sbin/sendmail sendmail > /usr/sbin/sendmail.postfix 15 > + sed -i 's/usr\/sbin\/sendmail/usr/sbin/sendmail.postfix/' > /opt/pakfire/db/rootfiles/postfix > +fi > +# DMA - configure dma as default mta > mkdir /etc/alternatives > mkdir /var/lib/alternatives > /usr/sbin/alternatives --install /usr/sbin/sendmail sendmail > /usr/sbin/sendmail.dma 20 --===============4423452751458552104== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC Q2dBR0JRSldINGNLQUFvSkVJQjU4UDl2a0FrSGJLMFFBS1FzalVWNURZeW5mcTdQQ2tETzc3Q1YK QnQ2R1pYdTJuNkliRk56cnlXZ0E1Nlh5T3B0aWNVUlNxNDhSMThnWCtJelRMaGpmL2tMTVVDSElx amwvWG9mRwpnOWFmVG9ZN0xpZHlsMGhFSytVZDYwMXNEUnppcEFvdGoyWDBWRm5SKzdVUnBSL2NH QlM1QUQ3OW9tR2hFNjN3ClU5Rmw5VXR1S3pzSUdNS3FQV3JPRVBkdTJjdktUd3huMHc2OXh0K2k4 aXZrbzEzMDNjOU5LS01lREMzMlJPdk0KLzVWTFRtWDQza1BnTnVHOU1pKzF3clNVcnpOTS8welI3 RExyMmxjSUVGaFQ0N3E5aWJRZm5MOURRaWJzZHhaVgorV2psU2dXREtVUmxGTElhTEpTTkhHLzVp cFZiSElablc5WVljeE9WdkY1ampDQTc0NG1OWnN5aHluMHVBcGxSCjcvYjRpME15cEphazdiQy9B YW9DeXd0cjNhNkNRamlQMFhNMTFEMlpxSVJ2NkUzbGZSMllSR1pGU3ltMmFPZi8KT2svdWREMEpP RmV2RGVRQjBmMEYwMGlMbGhWTlVyUk9WZHZWMW9VdmFmL3FodFh2cVhIbUcwZmZwU3FJRTlqaApQ SlBPUmtNbi9ObWRKTDBUM296VTVJVnIrZVlZS1UvUlJTdi8xTHZwYXRZNmcvcVRWb3A3dlV1Rjh1 RzZMS0VuCk80dWZxVkxkY3ZnMktBY0E5THpQZVpkRGVGZXYrQkl3YmhtSUV2R2xMaVAwaTdzU0tJ azhiZzAvL0gxMmF1WlcKaGlrQWlSTEY1YVBoVjVwUUtacXpsWGJlMEU3T2FhekQxQlc1dEVhNDRV aXpSSHp5MTFEbWJidjhVTzJqK2JVdAp6bEgvZm5va1NhM3ZMZWNPeGJEKwo9ZmFaWQotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============4423452751458552104==--