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 925038e35d5f8a5f9dd5874deb22184d6d56fe1e (commit) via 0108e6eeebe3a89455792f2faa93b90e3fab370c (commit) from d16bcc24e4ec1c0f7f3090ba51fdcc0529e8059e (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 925038e35d5f8a5f9dd5874deb22184d6d56fe1e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Sep 7 00:11:19 2010 +0200

Updater: Fix grub entry if root has no UUID.

commit 0108e6eeebe3a89455792f2faa93b90e3fab370c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 6 23:55:17 2010 +0200

Updated compat-wireless (2.6.36-rc3-1).

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

Summary of changes: config/rootfiles/core/test/update.sh | 6 +++++- doc/packages-list.txt | 4 ++-- lfs/compat-wireless | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh index a531e91..e4fef10 100644 --- a/config/rootfiles/core/test/update.sh +++ b/config/rootfiles/core/test/update.sh @@ -140,7 +140,11 @@ fi # echo echo Update grub configuration ... -sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf +if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf +else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +fi sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf

diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 74e427d..c0bfddb 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -67,8 +67,8 @@ * clamav-0.96.2 * cmake-2.4.8 * collectd-4.9.1 -* compat-wireless-2.6.35-1-kmod-2.6.32.21-ipfire -* compat-wireless-2.6.35-1-kmod-2.6.32.21-ipfire-xen +* compat-wireless-2.6.36-rc3-1-kmod-2.6.32.21-ipfire +* compat-wireless-2.6.36-rc3-1-kmod-2.6.32.21-ipfire-xen * coreutils-5.96 * cpio-2.11 * cpufrequtils-007 diff --git a/lfs/compat-wireless b/lfs/compat-wireless index f793098..3b08dda 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif

-VER = 2.6.35-1 +VER = 2.6.36-rc3-1

THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505 +$(DL_FILE)_MD5 = c800a7d8063adc420dc6756ca92275e4

install : $(TARGET)

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