From: root <root@Averatec.(none)>
Date: Mon, 5 Jan 2009 18:30:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.5-beta1~229
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=18680014062bb8e975258eb74c9f19aa9c478bd6;hp=5bc3883c7a5481a7c0bee32fd81413b3f1c9b630

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
---

diff --git a/config/rootfiles/core/25/files b/config/rootfiles/core/25/files
index 2bba9f37a9..38ddca2029 100644
--- a/config/rootfiles/core/25/files
+++ b/config/rootfiles/core/25/files
@@ -84,6 +84,3 @@ usr/lib/libthreadutil.so.2.2.3
 usr/lib/libupnp.so
 usr/lib/libupnp.so.3
 usr/lib/libupnp.so.3.0.5
-usr/sbin/pptp
-etc/rc.d/init.d/networking/red
-srv/web/ipfire/cgi-bin/pppsetup.cgi
diff --git a/config/rootfiles/core/26/files b/config/rootfiles/core/26/files
new file mode 100644
index 0000000000..9c27d4c654
--- /dev/null
+++ b/config/rootfiles/core/26/files
@@ -0,0 +1,3 @@
+usr/sbin/pptp
+etc/rc.d/init.d/networking/red
+srv/web/ipfire/cgi-bin/pppsetup.cgi
diff --git a/config/rootfiles/core/26/meta b/config/rootfiles/core/26/meta
new file mode 100644
index 0000000000..d547fa86fa
--- /dev/null
+++ b/config/rootfiles/core/26/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/26/update.sh b/config/rootfiles/core/26/update.sh
new file mode 100644
index 0000000000..8a87d9ca53
--- /dev/null
+++ b/config/rootfiles/core/26/update.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+extract_files
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"