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, core124,
 updated. e3ab1962ed4e129d02b6e98777ef0fe2accf2af4
Date: Fri, 28 Sep 2018 17:44:09 +0100
Message-ID: <20180928164409.AF2DA1081BD3@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7965362801585856779=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============7965362801585856779==
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, core124 has been updated
       via  e3ab1962ed4e129d02b6e98777ef0fe2accf2af4 (commit)
       via  d435f08d9b4a40817d6ae8601b20ef392253338f (commit)
       via  71954dcac4e29a67477f2d0d9593b60c7272c447 (commit)
      from  ae61c74db903ac96e4c923cdb1e44add69a527a8 (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 e3ab1962ed4e129d02b6e98777ef0fe2accf2af4
Merge: d435f08d9 ae61c74db
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Sep 28 18:43:15 2018 +0200

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

commit d435f08d9b4a40817d6ae8601b20ef392253338f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Sep 28 17:53:03 2018 +0200

    core124: add apache initskript and nsswitch.conf to updater
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 71954dcac4e29a67477f2d0d9593b60c7272c447
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Sep 28 17:49:10 2018 +0200

    core124: don't remove network trigger script
   =20
    this script is still needed if /var/ipfire is on an extra partition.
    New installations works without this script.
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/124/filelists/files | 2 ++
 config/rootfiles/core/124/update.sh       | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/cor=
e/124/filelists/files
index 25e812593..3e7153e12 100644
--- a/config/rootfiles/core/124/filelists/files
+++ b/config/rootfiles/core/124/filelists/files
@@ -1,6 +1,8 @@
 etc/system-release
 etc/issue
+etc/nsswitch.conf
 etc/rc.d/helper/aws-setup
+etc/rc.d/init.d/apache
 etc/rc.d/init.d/aws
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/networking/red.down/10-static-routes
diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/=
update.sh
index 25a7fd68a..17208b769 100644
--- a/config/rootfiles/core/124/update.sh
+++ b/config/rootfiles/core/124/update.sh
@@ -82,9 +82,6 @@ rm -f  /etc/sysconfig/lm_sensors
 # Stop services
=20
 # Remove files
-rm -f \
-	/etc/rc.d/rcsysinit.d/S90network-trigger \
-	/etc/rc.d/init.d/network-trigger
=20
 # Extract files
 extract_files


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

--===============7965362801585856779==--