From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, core125,
 updated. 29f5339e1792191cb46984f6b1f0197cb959764a
Date: Sun, 11 Nov 2018 16:08:29 +0000
Message-ID: <20181111160829.8730B1081BB0@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3588602643267356232=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3588602643267356232==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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, core125 has been updated
       via  29f5339e1792191cb46984f6b1f0197cb959764a (commit)
       via  78e0d8b1da5cb8de19699360e4fac4dfc4cf8389 (commit)
       via  f9b85eecdd4063acb1af7607bc0c978bc657c6b5 (commit)
      from  8e68bb83c68485337739093dbf17141fd098bfeb (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 29f5339e1792191cb46984f6b1f0197cb959764a
Merge: 78e0d8b1d 8e68bb83c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Nov 11 17:07:15 2018 +0100

    Merge branch 'core124' of git.ipfire.org:/pub/git/ipfire-2.x into core125

commit 78e0d8b1da5cb8de19699360e4fac4dfc4cf8389
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Nov 11 16:25:29 2018 +0100

    core125: rewrite sshd configfile
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit f9b85eecdd4063acb1af7607bc0c978bc657c6b5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Nov 11 16:10:57 2018 +0100

    core125: add armv5tel glibc to update
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/{oldcore/100 =3D> core/125}/filelists/armv5tel/glibc | 0
 config/rootfiles/core/125/update.sh                                 | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 copy config/rootfiles/{oldcore/100 =3D> core/125}/filelists/armv5tel/glibc (=
100%)

Difference in files:
diff --git a/config/rootfiles/core/125/filelists/armv5tel/glibc b/config/root=
files/core/125/filelists/armv5tel/glibc
new file mode 120000
index 000000000..4c70d724b
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/armv5tel/glibc
@@ -0,0 +1 @@
+../../../../common/armv5tel/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/core/125/=
update.sh
index 62214339e..130d8a754 100644
--- a/config/rootfiles/core/125/update.sh
+++ b/config/rootfiles/core/125/update.sh
@@ -55,8 +55,8 @@ telinit u
 # Reload sysctl.conf
 sysctl -p
=20
-# restart init
-telinit u
+# regenerate ssh configfile
+/usr/local/bin/sshctrl
=20
 # This update needs a reboot...
 #touch /var/run/need_reboot


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

--===============3588602643267356232==--