[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 8f1fe7c5314aae2893a52959f0d06dd9c0d28d00

[git@ipfire.org]

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  8f1fe7c5314aae2893a52959f0d06dd9c0d28d00 (commit)
       via  ccb8e47d0eafccef6b69c7094b3330dc95eeef54 (commit)
       via  d82c564b232dd1db917c9159c520d43f31723278 (commit)
      from  02626065a8a60e92fa9c728f8b3e225a7e64ad2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8f1fe7c5314aae2893a52959f0d06dd9c0d28d00
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Sep 27 10:56:34 2015 +0200

    core94: fix chrontab modification check for dma.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit ccb8e47d0eafccef6b69c7094b3330dc95eeef54
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Sep 27 10:42:38 2015 +0200

    core94: allow rootlogin only if the user has not blocked it before.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit d82c564b232dd1db917c9159c520d43f31723278
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Sep 27 10:42:01 2015 +0200

    core94: fix sed syntax.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/94/update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
index 6df0958..ff9797c 100644
--- a/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/core/94/update.sh
@@ -44,7 +44,7 @@ extract_files
 
 # Update SSH configuration
 sed -i /etc/ssh/sshd_config \
-	-e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/'
+	-e 's/^#PermitRootLogin yes$/PermitRootLogin yes/'
 
 # Move away old and unsupported keys
 mv -f /etc/ssh/ssh_host_dsa_key{,.old}
@@ -56,7 +56,7 @@ mv -f /etc/ssh/ssh_host_rsa_key{,.old}
 sed -i /var/spool/cron/root.orig -e "/Force an update once a month/d"
 sed -i /var/spool/cron/root.orig -e "/ddns update-all --force/d"
 
-grep -qv "dma -q" || cat <<EOF >> /var/spool/cron/root.orig
+grep -q "dma -q" /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
 
 # Retry sending spooled mails regularly
 %hourly * /usr/sbin/dma -q


hooks/post-receive
--
IPFire 2.x development tree