[git.ipfire.org] IPFire 2.x development tree branch, core123, updated. b211357dae62b44f53c88ded9de6d601c6a8acb8

[git.ipfire.org] IPFire 2.x development tree branch, core123, updated. b211357dae62b44f53c88ded9de6d601c6a8acb8

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 5838 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, core123 has been updated
       via  b211357dae62b44f53c88ded9de6d601c6a8acb8 (commit)
       via  96422f85b6afe56a2d76773fd30e34a6220fbad5 (commit)
       via  40436fa1491084ff370e78c98739d7fd3b7911be (commit)
       via  281d75c9457673aac5a9d190a5f4e97d0e60c5ee (commit)
       via  3eeff87fe62ebbdab3173704477d57dd5c9403ab (commit)
       via  9ae73c309019c72557f6dad4699ed409c9d8910a (commit)
       via  6cf586436b1e394375df7c9f1f5e36189143b855 (commit)
       via  bd7d957fae0c0d46a5f9e505d3e8ef9b91dd6f85 (commit)
      from  f3d23ae0ff98f925f2120f60923ab591d7a3adc6 (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 b211357dae62b44f53c88ded9de6d601c6a8acb8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Aug 15 13:30:07 2018 +0200

    core123: ship updated unbound initskript
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 96422f85b6afe56a2d76773fd30e34a6220fbad5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 15 11:50:14 2018 +0100

    aws: Hide pakfire update output
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 40436fa1491084ff370e78c98739d7fd3b7911be
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 15 11:49:30 2018 +0100

    aws: Write user-data log to file only
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 281d75c9457673aac5a9d190a5f4e97d0e60c5ee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 15 11:45:27 2018 +0100

    aws: Execute reboot when an update requires one
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 3eeff87fe62ebbdab3173704477d57dd5c9403ab
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 15 11:25:38 2018 +0100

    Fix typo in unbound initscript
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 9ae73c309019c72557f6dad4699ed409c9d8910a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 15 11:11:56 2018 +0100

    aws: Set PATH to search in /usr/local/(s)bin
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 6cf586436b1e394375df7c9f1f5e36189143b855
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 15 11:10:59 2018 +0100

    aws: Import pakfire keys before the first launch
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit bd7d957fae0c0d46a5f9e505d3e8ef9b91dd6f85
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 15 11:09:55 2018 +0100

    aws: Log output of user-data script to /root/user-data.log
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/123/filelists/files |  1 +
 src/initscripts/helper/aws-setup          | 16 ++++++++++++++--
 src/initscripts/system/unbound            |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files
index 9e5466ab5..3ff006fe5 100644
--- a/config/rootfiles/core/123/filelists/files
+++ b/config/rootfiles/core/123/filelists/files
@@ -3,6 +3,7 @@ etc/issue
 etc/rc.d/helper/aws-setup
 etc/rc.d/init.d/aws
 etc/rc.d/init.d/collectd
+etc/rc.d/init.d/unbound
 etc/rc.d/rcsysinit.d/S74aws
 etc/sysctl.conf
 srv/web/ipfire/cgi-bin/ids.cgi
diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index 792a7d5a5..893246ba1 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -3,6 +3,9 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+# Set PATH to find our own executables
+export PATH=/usr/local/sbin:/usr/local/bin:${PATH}
+
 get() {
 	local file="${1}"
 
@@ -111,8 +114,17 @@ import_aws_configuration() {
 
 	# Download the user-data script only on the first boot
 	if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then
+		# Initialize pakfire
+		/etc/init.d/pakfire start &>/dev/null
+
 		# Install all available updates
-		pakfire update && pakfire upgrade -y
+		( pakfire update && pakfire upgrade -y ) &>/dev/null
+
+		# If an update requires a reboot, we will do it
+		if [ -e "/var/run/need_reboot" ]; then
+			reboot
+			exit 1
+		fi
 
 		# Download user-data
 		local user_data="$(get user-data)"
@@ -123,7 +135,7 @@ import_aws_configuration() {
 			chmod 700 /tmp/aws-user-data.script
 
 			# Run the user-data script
-			/tmp/aws-user-data.script
+			/tmp/aws-user-data.script &>/root/user-data.log
 
 			# Delete the script right away
 			rm /tmp/aws-user-data.script
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 9b6d32207..cc46c33c9 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -479,7 +479,7 @@ fix_time_if_dns_fail() {
 	if [ -e /var/ipfire/red/active ]; then
 		host 0.ipfire.pool.ntp.org > /dev/null 2>&1
 		if [ "${?}" != "0" ]; then
-			boot_mesg "DNS still not work ... init time with ntp.ipfire.org at 81.3.27.46 ..."
+			boot_mesg "DNS still not functioning... Trying to sync time with ntp.ipfire.org (81.3.27.46)..."
 			loadproc /usr/local/bin/settime 81.3.27.46
 		fi
 	fi


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