[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. f1defee0b31798b403bb07c72d9dab54f70f2086

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4135 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, fifteen has been updated
       via  f1defee0b31798b403bb07c72d9dab54f70f2086 (commit)
       via  6f1467d7b13400b9d3d849d7956c0d3c100dc0f2 (commit)
      from  a0e8bf8f365b7d24f622a8250da4a67948b946bb (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 f1defee0b31798b403bb07c72d9dab54f70f2086
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Sep 2 10:51:57 2013 +0200

    kernel: enable console on framebuffer.

commit 6f1467d7b13400b9d3d849d7956c0d3c100dc0f2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Sep 2 00:08:07 2013 +0200

    w_scan: set output format to vdr 2.0.

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

Summary of changes:
 config/kernel/kernel.config.i586-ipfire     |  2 +-
 config/kernel/kernel.config.i586-ipfire-pae |  2 +-
 config/w_scan/w_scan_start                  | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 24c0b32..34f55c0 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -3890,7 +3890,7 @@ CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_MDA_CONSOLE=m
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 807a9a2..ce9cfd5 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -3910,7 +3910,7 @@ CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_MDA_CONSOLE=m
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start
index 05d9a78..c424f5f 100755
--- a/config/w_scan/w_scan_start
+++ b/config/w_scan/w_scan_start
@@ -109,26 +109,26 @@ clear
 rm -rf /tmp/channels.conf
 if [[ "$W_SCAN_TYPE" == *DVB-T* ]]; then
 	echo ":->W-SCAN DVB-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
-	$WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf
+	$WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf
 fi
 if [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then
 	echo ":->W-SCAN DVB-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
-	$WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf
+	$WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf
 fi
 if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then
 	for SATELLITE in $W_SCAN_SATELLITE;
 	do
 		echo ":->W-SCAN DVB-S $SATELLITE $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
-		$WSCAN -f s -s $SATELLITE -C UTF-8 -o 7 >>/tmp/channels.conf
+		$WSCAN -f s -s $SATELLITE -C UTF-8 -o 2 >>/tmp/channels.conf
 	done
 fi
 if [[ "$W_SCAN_TYPE" == *ATSC-T* ]]; then
 	echo ":->W-SCAN ATSC-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
-	$WSCAN -f a -A 1 -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf
+	$WSCAN -f a -A 1 -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf
 fi
 if [[ "$W_SCAN_TYPE" == *ATSC-C* ]]; then
 	echo ":->W-SCAN ATSC-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
-	$WSCAN -f a -A 2 -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf
+	$WSCAN -f a -A 2 -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf
 fi
 
 # Save result to current dir.


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