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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 1846 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  d99f0ff8c620a7fa832354d403cf701120273d40 (commit)
       via  2a127986dc90b9449d5e69c388b15efb851b5980 (commit)
      from  bfaa69562a5a0d9a57c3a374d967da9875ff77be (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 d99f0ff8c620a7fa832354d403cf701120273d40
Merge: 2a12798 bfaa695
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jan 14 22:35:11 2014 +0100

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

commit 2a127986dc90b9449d5e69c388b15efb851b5980
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jan 14 22:34:23 2014 +0100

    fifteen: don't run firstsetup after update.

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

Summary of changes:
 config/rootfiles/core/76/update.sh | 3 +++
 1 file changed, 3 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index eafb3cf..1a3c6b3 100644
--- 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
 #


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