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

diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index eafb3cf021aa3a8d121b132e234f31f849dffb02..1a3c6b314f8279c2ce21861687c87014a977edc1 100644 (file)
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@ -272,6 +272,9 @@ sed -i -e "s|^none\s/var/run|#none  /var/run|/g" /etc/fstab
 # Convert udev persistent network rules
 sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules
 
+# Firstsetup was already run
+touch /var/ipfire/main/firstsetup_ok
+
 #
 # Start services
 #