[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 0ffd7752112e40abfd1820146f41e1a869c9a171

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2389 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, thirteen has been updated
       via  0ffd7752112e40abfd1820146f41e1a869c9a171 (commit)
       via  2e67687f91f27714db2263fbe7520bcac0bd190f (commit)
      from  4a8dc4556aed707286cf3930f57d62362d85a6f8 (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 0ffd7752112e40abfd1820146f41e1a869c9a171
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Sep 24 08:01:03 2012 +0200

    kernel: i586 enable nouveau module.

commit 2e67687f91f27714db2263fbe7520bcac0bd190f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Sep 24 07:59:46 2012 +0200

    extrahd: fix grep syntax in scanhd script.

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

Summary of changes:
 config/kernel/kernel.config.i586-ipfire |    3 ++-
 src/scripts/scanhd                      |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 4295eb4..78de471 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -4006,7 +4006,8 @@ CONFIG_USBIP_HOST=m
 # CONFIG_POHMELFS is not set
 CONFIG_IDE_PHISON=m
 # CONFIG_LINE6_USB is not set
-# CONFIG_DRM_NOUVEAU is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 
 #
 # I2C encoder or helper chips
diff --git a/src/scripts/scanhd b/src/scripts/scanhd
index f46a630..b208bbb 100644
--- a/src/scripts/scanhd
+++ b/src/scripts/scanhd
@@ -11,7 +11,7 @@ case "$1" in
 		done
 		;;
 	partitions)
-		cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \
+		cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[[:space:]]*$" | \
 			while read device size; do
 				[ -z "${device}" ] && continue
 				echo "${device};${size};$(blkid -c /dev/null -s UUID -o value /dev/${device});"


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