[PATCH 1/2] Core94: fix update.sh for dma

[PATCH 1/2] Core94: fix update.sh for dma

[Alexander Marx]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

---
 config/rootfiles/core/94/update.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
index 6560662..1b9eed7 100644
--- a/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/core/94/update.sh
@@ -70,6 +70,11 @@ EOF
 
 fcrontab -z &>/dev/null
 
+# dma files
+mkdir /etc/alternatives
+mkdir /var/lib/alternatives
+/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.dma 20
+
 # Start services
 /etc/init.d/dnsmasq start
 /etc/init.d/sshd start
-- 
1.9.1

[PATCH 2/2] Core94: fix for dma when postfix is installed

[Alexander Marx]

[-- Attachment #1: Type: text/plain, Size: 900 bytes --]

---
 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
-- 
1.9.1

Re: [PATCH 2/2] Core94: fix for dma when postfix is installed

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1487 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/2] Core94: fix update.sh for dma

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

Hi,

these changes look good, you are missing the Signed-off-by: line
though. I will merge this and add it in, but please take care about
this the next time.

-Michael

On Thu, 2015-10-15 at 12:18 +0200, Alexander Marx wrote:
> ---
>  config/rootfiles/core/94/update.sh | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/config/rootfiles/core/94/update.sh
> b/config/rootfiles/core/94/update.sh
> index 6560662..1b9eed7 100644
> --- a/config/rootfiles/core/94/update.sh
> +++ b/config/rootfiles/core/94/update.sh
> @@ -70,6 +70,11 @@ EOF
>  
>  fcrontab -z &>/dev/null
>  
> +# dma files
> +mkdir /etc/alternatives
> +mkdir /var/lib/alternatives
> +/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail
> /usr/sbin/sendmail.dma 20
> +
>  # Start services
>  /etc/init.d/dnsmasq start
>  /etc/init.d/sshd start

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]