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 1a10fcdcec6d396e339d1b91e924f31e1cfd3f6f (commit) via 492b2601788ccca269986c55a0b090ccbf876498 (commit) from e73e134c9689a672c60eb2e0f6f29dc8b522ef1a (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 1a10fcdcec6d396e339d1b91e924f31e1cfd3f6f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Dec 1 08:30:38 2010 +0100

Removed unsupportet rootdelay=10 switch from grub.conf.

commit 492b2601788ccca269986c55a0b090ccbf876498 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Dec 1 08:25:37 2010 +0100

Removed unsupported nodma switch from syslinux.cfg.

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

Summary of changes: config/grub/grub.conf | 12 ++++++------ config/syslinux/options.msg | 4 ++-- config/syslinux/syslinux.cfg | 7 ++----- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 5 files changed, 12 insertions(+), 15 deletions(-)

Difference in files: diff --git a/config/grub/grub.conf b/config/grub/grub.conf index c3f2ebd..d71e0c6 100644 --- a/config/grub/grub.conf +++ b/config/grub/grub.conf @@ -11,31 +11,31 @@ splashimage (hd0,0)/grub/ipfire.xpm.gz #terminal --timeout=1 serial console title IPFire root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 MOUNT initrd /ipfirerd-KVER.img savedefault 0 title IPFire (vesafb 640x480) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=785 MOUNT initrd /ipfirerd-KVER.img savedefault 1 title IPFire (vesafb 800x600) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=788 MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=788 MOUNT initrd /ipfirerd-KVER.img savedefault 2 title IPFire (vesafb 1024x768) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT initrd /ipfirerd-KVER.img savedefault 3 title IPFire (acpi disabled) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 acpi=off MOUNT initrd /ipfirerd-KVER.img savedefault 4 title IPFire (single Processor) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 nosmp MOUNT initrd /ipfirerd-KVER.img savedefault 5 diff --git a/config/syslinux/options.msg b/config/syslinux/options.msg index a0b756b..57a38c2 100644 --- a/config/syslinux/options.msg +++ b/config/syslinux/options.msg @@ -5,8 +5,6 @@

- To disable vga mode, type: 04novga <ENTER>07.

- - To enable dma support, type: 04dma <ENTER>07. - - To test the memory in your system type: 04memtest <ENTER>07.

- To install in unattended mode, type: 04unattended <ENTER>07. @@ -27,4 +25,6 @@

+ + 0f[F1-Main] [F2-Options]07 diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg index 361a316..ac9bdc3 100644 --- a/config/syslinux/syslinux.cfg +++ b/config/syslinux/syslinux.cfg @@ -4,13 +4,10 @@ PROMPT 1 F1 boot.msg F2 options.msg DEFAULT vmlinuz - APPEND ide=nodma initrd=instroot vga=791 splash=silent ro + APPEND initrd=instroot vga=791 splash=silent ro LABEL novga KERNEL vmlinuz - APPEND ide=nodma initrd=instroot ro -LABEL dma - KERNEL vmlinuz - APPEND initrd=instroot vga=791 splash=silent ro + APPEND initrd=instroot ro LABEL unattended KERNEL vmlinuz APPEND ide=nodma initrd=instroot vga=791 splash=silent unattended ro diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index e323ee8..5ca9693 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -52,7 +52,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae.conf # echo "" >> /boot/grub/grub.conf echo "title IPFire (PAE-Kernel)" >> /boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT rootdelay=10 panic=10 $MOUNT" >> /boot/grub/grub.conf +echo " kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT panic=10 $MOUNT" >> /boot/grub/grub.conf echo " initrd /ipfirerd-$KVER-pae.img" >> /boot/grub/grub.conf echo " savedefault $ENTRY" >> /boot/grub/grub.conf # diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index d566405..d9bc9df 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -52,7 +52,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf # echo "" >> /boot/grub/grub.conf echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf +echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf echo " initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf echo "# savedefault $ENTRY" >> /boot/grub/grub.conf #

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