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, master has been updated via 834ca786da89d5e61ec881d4f065a9c5ef92d287 (commit) via 2a3329bce4445711a0f5f982bee7648f7ed40cb8 (commit) via 1ccf0a2b880095fddc42c609ab05f67e3141bc75 (commit) via edc2be7080a64a27bd077b91b5eeec912e8baf2e (commit) via b4c77ffb891f956f2b3c017bd55090a57e3b9862 (commit) via e247eb7cec0c628fb1d0a07e9cec3ced925b53d9 (commit) from 76b8277500d32f633dd9d044d4593aa8a4d17013 (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 834ca786da89d5e61ec881d4f065a9c5ef92d287 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 26 17:39:00 2012 +0100
initscripts: rootfile update.
commit 2a3329bce4445711a0f5f982bee7648f7ed40cb8 Merge: 1ccf0a2 b4c77ff Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jan 24 21:44:16 2012 +0100
Merge commit 'origin/static-routes'
commit 1ccf0a2b880095fddc42c609ab05f67e3141bc75 Merge: edc2be7 e247eb7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jan 24 20:53:06 2012 +0100
Merge commit 'origin/next'
commit edc2be7080a64a27bd077b91b5eeec912e8baf2e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jan 24 18:17:14 2012 +0100
flash-images: activate autoresize also on arm.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/armv5tel/initscripts | 3 +++ config/rootfiles/common/i586/initscripts | 2 ++ config/rootfiles/core/56/filelists/files | 1 + lfs/flash-images | 8 ++++---- .../init.d/networking/red.down/10-static-routes | 4 ++++ .../init.d/networking/red.up/10-static-routes | 4 ++++ src/scripts/readhash | 2 +- 7 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 src/initscripts/init.d/networking/red.down/10-static-routes create mode 100644 src/initscripts/init.d/networking/red.up/10-static-routes
Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index a7f0fed..eaa6352 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -220,3 +220,6 @@ etc/sysconfig/modules etc/sysconfig/rc etc/sysconfig/rc.local etc/init.d +etc/rc.d/init.d/networking/red.down/10-static-routes +etc/rc.d/init.d/networking/red.up/10-static-routes +#etc/rc.d/init.d/transmission diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 91e3308..882628a 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -223,3 +223,5 @@ etc/sysconfig/modules etc/sysconfig/rc etc/sysconfig/rc.local etc/init.d +etc/rc.d/init.d/networking/red.down/10-static-routes +etc/rc.d/init.d/networking/red.up/10-static-routes diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files index 58c1960..7b1d4c0 100644 --- a/config/rootfiles/core/56/filelists/files +++ b/config/rootfiles/core/56/filelists/files @@ -8,3 +8,4 @@ srv/web/ipfire/cgi-bin/media.cgi usr/local/bin/hddshutdown usr/local/bin/makegraphs usr/local/bin/openvpnctrl +usr/local/bin/readhash diff --git a/lfs/flash-images b/lfs/flash-images index 4c99822..daf3ec1 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -111,15 +111,15 @@ ifneq "$(MACHINE_TYPE)" "arm" sed -i -e "s|ROOT|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/boot/grub/grub.conf ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
+ # Copy grub files manually + cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ +endif + # Setup symlink for partresize at first boot... ln -sf ../init.d/partresize $(MNThdd)/etc/rc.d/rcsysinit.d/S25partresize # Setup symlink for fsresize at second boot... ln -sf ../init.d/fsresize $(MNThdd)/etc/rc.d/rcsysinit.d/S26fsresize
- # Copy grub files manually - cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ -endif - # Unmount umount $(MNThdd)/proc umount $(MNThdd)/dev diff --git a/src/initscripts/init.d/networking/red.down/10-static-routes b/src/initscripts/init.d/networking/red.down/10-static-routes new file mode 100644 index 0000000..f8f00a7 --- /dev/null +++ b/src/initscripts/init.d/networking/red.down/10-static-routes @@ -0,0 +1,4 @@ +#!/bin/bash + +# Update the static routes. +exec /etc/rc.d/init.d/static-routes start diff --git a/src/initscripts/init.d/networking/red.up/10-static-routes b/src/initscripts/init.d/networking/red.up/10-static-routes new file mode 100644 index 0000000..f8f00a7 --- /dev/null +++ b/src/initscripts/init.d/networking/red.up/10-static-routes @@ -0,0 +1,4 @@ +#!/bin/bash + +# Update the static routes. +exec /etc/rc.d/init.d/static-routes start diff --git a/src/scripts/readhash b/src/scripts/readhash index 63a3e0f..8c187d5 100644 --- a/src/scripts/readhash +++ b/src/scripts/readhash @@ -13,7 +13,7 @@ VARNAME='[A-Za-z_][A-zA-z0-9_]*'
# For the assigned value we only accept a limited number of characters - none # of which are shell metachars -VARCHARS='A-Za-z0-9=/,._@#+-' +VARCHARS='A-Za-z0-9=/,.:_@#+-' VARVAL="[${VARCHARS}]*"
sed -ne "s/(${VARNAME})=(${VARVAL})$/\1=\2/p" $1
hooks/post-receive -- IPFire 2.x development tree