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 dd62fd25cde358524861fdd8e20aed1a83c6a6da (commit) via 595e89a87745e8f1f202d86a7dd0e9e2f1cb4783 (commit) from 9ac43fb9e197e47df7ff9b14d9ba80eca592d9f2 (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 dd62fd25cde358524861fdd8e20aed1a83c6a6da Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jan 12 23:22:39 2014 +0100

fifteen: remove /var/run from fstab.

commit 595e89a87745e8f1f202d86a7dd0e9e2f1cb4783 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jan 12 23:19:35 2014 +0100

make.sh: fix git branch read for new git versions.

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

Summary of changes: config/etc/fstab | 1 - config/rootfiles/core/76/update.sh | 1 + make.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/etc/fstab b/config/etc/fstab index 805ed4b..0cd30eb 100644 --- a/config/etc/fstab +++ b/config/etc/fstab @@ -7,4 +7,3 @@ DEVICE3 / FSTYPE defaults 1 1 DEVICE4 /var FSTYPE defaults 1 1 none /var/log/rrd tmpfs defaults,size=64M 0 0 none /var/lock tmpfs defaults,size=8M 0 0 -none /var/run tmpfs defaults,size=2M 0 0 diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh index 8d55152..c572e7c 100644 --- a/config/rootfiles/core/76/update.sh +++ b/config/rootfiles/core/76/update.sh @@ -267,6 +267,7 @@ sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab sed -i -e "s/^proc/#proc/g" /etc/fstab sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab sed -i -e "s/^devpts/#devpts/g" /etc/fstab +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 diff --git a/make.sh b/make.sh index fa153c4..5d12665 100755 --- a/make.sh +++ b/make.sh @@ -27,7 +27,7 @@ SNAME="ipfire" # Short name VERSION="2.15" # Version number CORE="76-beta1" # Core Level (Filename) PAKFIRE_CORE="76" # Core Level (PAKFIRE) -GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch +GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level

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