[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5c3e69231415cb9faedaa641504bbe7dfeec2d1d

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5c3e69231415cb9faedaa641504bbe7dfeec2d1d

[git]

[-- Attachment #1: Type: text/plain, Size: 3848 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  5c3e69231415cb9faedaa641504bbe7dfeec2d1d (commit)
       via  ac8d83976a594fcf2caaab3b721abdf0167fbed9 (commit)
      from  0b028257bbd5d9d5c79efaf120f6b0db4b3f264e (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 5c3e69231415cb9faedaa641504bbe7dfeec2d1d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Mar 3 11:50:17 2013 +0100

    core67: stop squid at update, disable initrd rebuild.

commit ac8d83976a594fcf2caaab3b721abdf0167fbed9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Mar 3 11:48:49 2013 +0100

    core67: add fireinfo and squid to update.

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

Summary of changes:
 config/rootfiles/core/67/filelists/files             |  1 +
 .../{oldcore/44 => core/67}/filelists/fireinfo       |  0
 config/rootfiles/core/{66 => 67}/filelists/squid     |  0
 config/rootfiles/core/67/update.sh                   | 20 +++++++++++---------
 4 files changed, 12 insertions(+), 9 deletions(-)
 copy config/rootfiles/{oldcore/44 => core/67}/filelists/fireinfo (100%)
 copy config/rootfiles/core/{66 => 67}/filelists/squid (100%)

Difference in files:
diff --git a/config/rootfiles/core/67/filelists/files b/config/rootfiles/core/67/filelists/files
index 168c7d1..ba0d5cc 100644
--- a/config/rootfiles/core/67/filelists/files
+++ b/config/rootfiles/core/67/filelists/files
@@ -1,3 +1,4 @@
 etc/system-release
 etc/issue
+srv/web/ipfire/cgi-bin/proxy.cgi
 var/ipfire/langs
diff --git a/config/rootfiles/core/67/filelists/fireinfo b/config/rootfiles/core/67/filelists/fireinfo
new file mode 120000
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/67/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/67/filelists/squid b/config/rootfiles/core/67/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/67/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/67/update.sh b/config/rootfiles/core/67/update.sh
index 142457a..caaf3c9 100644
--- a/config/rootfiles/core/67/update.sh
+++ b/config/rootfiles/core/67/update.sh
@@ -34,6 +34,7 @@ done
 
 #
 #Stop services
+/etc/init.d/squid stop
 
 #
 #Extract files
@@ -41,6 +42,7 @@ extract_files
 
 #
 #Start services
+/etc/init.d/squid start
 
 #
 #Update Language cache
@@ -66,15 +68,15 @@ else
 fi
 
 #Rebuild initrd's
-if [ -e /boot/ipfirerd-3.2.38.img ]; then
-/sbin/dracut --force --verbose /boot/ipfirerd-3.2.38.img 3.2.38-ipfire
-fi
-if [ -e /boot/ipfirerd-3.2.38-pae.img ]; then
-/sbin/dracut --force --verbose /boot/ipfirerd-3.2.38-pae.img 3.2.38-ipfire-pae
-fi
-if [ -e /boot/ipfirerd-2.6.32.60-xen.img ]; then
-/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.60-xen.img 2.6.32.60-ipfire-xen
-fi
+#if [ -e /boot/ipfirerd-3.2.38.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-3.2.38.img 3.2.38-ipfire
+#fi
+#if [ -e /boot/ipfirerd-3.2.38-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-3.2.38-pae.img 3.2.38-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.60-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.60-xen.img 2.6.32.60-ipfire-xen
+#fi
 
 sync
 


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