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 71d51da31f7d045d1dab743df7e5582f27665d43 (commit) via 5faa66cfda185c9f7148c886262fddd24be75f3a (commit) via 0329efd251cea8c124bb83876cc527a7bb84dbf2 (commit) from 4d316a78078b0b4448365ac5040dacecf5777def (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 71d51da31f7d045d1dab743df7e5582f27665d43 Merge: 5faa66c 4d316a7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 2 23:09:05 2010 +0100

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

commit 5faa66cfda185c9f7148c886262fddd24be75f3a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 2 23:07:35 2010 +0100

Installer: if installer was run with serial console patch grub and inittab.

commit 0329efd251cea8c124bb83876cc527a7bb84dbf2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 2 23:06:46 2010 +0100

Installer: check md5 of downloaded iso.

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

Summary of changes: src/install+setup/install/downloadsource.sh | 20 ++++++++++++-------- src/install+setup/install/main.c | 25 ++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 9 deletions(-)

Difference in files: diff --git a/src/install+setup/install/downloadsource.sh b/src/install+setup/install/downloadsource.sh index 8db2dc6..8471df3 100644 --- a/src/install+setup/install/downloadsource.sh +++ b/src/install+setup/install/downloadsource.sh @@ -41,15 +41,19 @@ sleep 15 echo echo "Download with wget..." wget $IPFireISO -O /tmp/download.iso -t3 -U IPFire_NetInstall/2.x +wget $IPFireISO.md5 -O /tmp/download.iso.md5 -t3 -U IPFire_NetInstall/2.x echo echo "Checking download..." -mount /tmp/download.iso -o loop /cdrom 2> /dev/null -if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then - echo -n "null" > /tmp/source_device - echo "Found tarball in /tmp/download.iso" - exit 0 -else - echo "Found no tarballs in /tmp/download.iso - SKIP" +md5_file=`md5sum /tmp/download.iso | cut -d" " -f1` +md5_down=`cat /tmp/download.iso.md5 | cut -d" " -f1` +if [ "$md5_file" == "$md5_down" ]; then + mount /tmp/download.iso -o loop /cdrom 2> /dev/null + if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then + echo -n "null" > /tmp/source_device + echo "Found tarball in /tmp/download.iso" + exit 0 + fi + umount /cdrom 2> /dev/null fi -umount /cdrom 2> /dev/null +echo "Error - SKIP" exit 10 diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index ca2d5bd..cb697a1 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -70,6 +70,7 @@ int main(int argc, char *argv[]) char *yesnoharddisk[3]; // char *yesnoharddisk = { "NO", "YES", NULL }; int unattended = 0; + int serialconsole = 0; struct keyvalue *unattendedkv = initkeyvalues(); int hardyn = 0; char restore_file[STRING_SIZE] = ""; @@ -110,6 +111,10 @@ int main(int argc, char *argv[]) unattended = 1; runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds..."); } + // check if we have to patch for serial console + if (strstr (line, "console=ttyS0") != NULL) { + serialconsole = 1; + } }

// Read gpl ... @@ -511,7 +516,25 @@ int main(int argc, char *argv[]) errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]); goto EXIT; } - + + /* Serial console ? */ + if (serialconsole) { + /* grub */ + replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage"); + replace("/harddisk/boot/grub/grub.conf", "#serial", "serial"); + replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal"); + replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400 panic=10 "); + + /*inittab*/ + replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:"); + replace("/harddisk/etc/inittab", "2:2345:respawn:", "#2:2345:respawn:"); + replace("/harddisk/etc/inittab", "3:2345:respawn:", "#3:2345:respawn:"); + replace("/harddisk/etc/inittab", "4:2345:respawn:", "#4:2345:respawn:"); + replace("/harddisk/etc/inittab", "5:2345:respawn:", "#5:2345:respawn:"); + replace("/harddisk/etc/inittab", "6:2345:respawn:", "#6:2345:respawn:"); + replace("/harddisk/etc/inittab", "#7:2345:respawn:", "7:2345:respawn:"); + } + /* Copy restore file from cdrom */ if (unattended && (strlen(restore_file) > 0)) { fprintf(flog, "unattended: Copy restore file\n");

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