[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 75ec398fe93f38022eba3f64e17c86ed527317f0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 75ec398fe93f38022eba3f64e17c86ed527317f0

[git]

[-- Attachment #1: Type: text/plain, Size: 3883 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, next has been updated
       via  75ec398fe93f38022eba3f64e17c86ed527317f0 (commit)
       via  ee732b26aafc9122d02b75604aef02c584b349c3 (commit)
       via  edb56d84fac2a93351a2030b1485c3b4baa81e01 (commit)
       via  a8379a53d4bcde7e72463446d7f40e92534d532e (commit)
       via  3ae89dd63c69c3ba2c3854e9b211fecad02717b7 (commit)
       via  3ba1f74eb3f3a2fafe54fa26c8cd075a39ee7cfa (commit)
      from  45b6ea63afc826ee0500f54f66beeb102c8445e0 (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 75ec398fe93f38022eba3f64e17c86ed527317f0
Merge: ee732b2 45b6ea6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Aug 13 15:13:22 2015 +0200

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

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

Summary of changes:
 config/rootfiles/common/libevent2                         | 4 ++--
 config/rootfiles/core/93/filelists/libevent2              | 1 +
 config/rootfiles/{oldcore/80 => core/93}/filelists/nettle | 0
 config/rootfiles/oldcore/93/update.sh                     | 4 +++-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 120000 config/rootfiles/core/93/filelists/libevent2
 copy config/rootfiles/{oldcore/80 => core/93}/filelists/nettle (100%)

Difference in files:
diff --git a/config/rootfiles/common/libevent2 b/config/rootfiles/common/libevent2
index 5beb5f8..aab354e 100644
--- a/config/rootfiles/common/libevent2
+++ b/config/rootfiles/common/libevent2
@@ -34,12 +34,12 @@ usr/lib/libevent_openssl-2.0.so.5
 usr/lib/libevent_openssl-2.0.so.5.1.9
 #usr/lib/libevent_openssl.a
 #usr/lib/libevent_openssl.la
-#usr/lib/libevent_openssl.so
+usr/lib/libevent_openssl.so
 usr/lib/libevent_pthreads-2.0.so.5
 usr/lib/libevent_pthreads-2.0.so.5.1.9
 #usr/lib/libevent_pthreads.a
 #usr/lib/libevent_pthreads.la
-#usr/lib/libevent_pthreads.so
+usr/lib/libevent_pthreads.so
 #usr/lib/pkgconfig/libevent.pc
 #usr/lib/pkgconfig/libevent_openssl.pc
 #usr/lib/pkgconfig/libevent_pthreads.pc
diff --git a/config/rootfiles/core/93/filelists/libevent2 b/config/rootfiles/core/93/filelists/libevent2
new file mode 120000
index 0000000..42edc99
--- /dev/null
+++ b/config/rootfiles/core/93/filelists/libevent2
@@ -0,0 +1 @@
+../../../common/libevent2
\ No newline at end of file
diff --git a/config/rootfiles/core/93/filelists/nettle b/config/rootfiles/core/93/filelists/nettle
new file mode 120000
index 0000000..f0dba7a
--- /dev/null
+++ b/config/rootfiles/core/93/filelists/nettle
@@ -0,0 +1 @@
+../../../common/nettle
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/93/update.sh b/config/rootfiles/oldcore/93/update.sh
index e4e88a3..4644543 100644
--- a/config/rootfiles/oldcore/93/update.sh
+++ b/config/rootfiles/oldcore/93/update.sh
@@ -32,6 +32,7 @@ do
 done
 
 # Stop services
+/etc/init.d/dnsmasq stop
 /etc/init.d/squid stop
 
 # Extract files
@@ -46,6 +47,7 @@ rm -f /opt/pakfire/db/rootfiles/libevent2
 
 # Start services
 /etc/init.d/squid start
+/etc/init.d/dnsmasq start
 
 # This update need a reboot...
 #touch /var/run/need_reboot
@@ -55,7 +57,7 @@ rm -f /opt/pakfire/db/rootfiles/libevent2
 sendprofile
 # Update grub config to display new core version
 if [ -e /boot/grub/grub.cfg ]; then
-	grub-mkconfig > /boot/grub/grub.cfg
+	grub-mkconfig -o /boot/grub/grub.cfg
 fi
 sync
 


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