From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Nov 2013 20:43:20 +0000 (+0100)
Subject: Merge branch 'master' into fifteen
X-Git-Tag: v2.15-beta1~139
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=0fc392d65d513df573573dec57ccf06af2c29a9f;hp=5702b0cee557ec11ecda43a2482f72f212bffa84

Merge branch 'master' into fifteen
---

diff --git a/config/rootfiles/core/73/filelists/openssh b/config/rootfiles/core/73/filelists/openssh
new file mode 120000
index 0000000000..d8c77fd8e7
--- /dev/null
+++ b/config/rootfiles/core/73/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/73/update.sh b/config/rootfiles/oldcore/73/update.sh
index ee799adb62..a9fed1b4b4 100644
--- a/config/rootfiles/oldcore/73/update.sh
+++ b/config/rootfiles/oldcore/73/update.sh
@@ -70,7 +70,7 @@ fi
 sync
 
 # This update need a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 #
 #Finish