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 90431550c662d6e8888ea7050fdc957dea326272 (commit) via 9a3d3d9558b36ebb0a283e878a3be39e10fdab72 (commit) via be1fe6897c04e1fa4825a656a4bef95cf11d1afe (commit) from c7f9e0e99c67ed945d1c170d0329ed1b7ad02249 (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 90431550c662d6e8888ea7050fdc957dea326272 Merge: 9a3d3d9 c7f9e0e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 8 11:05:37 2012 +0200

Merge remote-tracking branch 'origin/thirteen' into thirteen

commit 9a3d3d9558b36ebb0a283e878a3be39e10fdab72 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 8 11:04:39 2012 +0200

Fix installation with HP SmartArray RAID controllers.

commit be1fe6897c04e1fa4825a656a4bef95cf11d1afe Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 6 16:55:27 2012 +0200

Remove some kernel boot options.

These options don't make much sense to me anymore. SMP code should not be a problem on any CPU as well as ACPI.

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

Summary of changes: config/grub/grub.conf | 22 +--------------------- src/install+setup/install/main.c | 4 ++-- src/install+setup/install/mountdest.sh | 9 ++++++++- 3 files changed, 11 insertions(+), 24 deletions(-)

Difference in files: diff --git a/config/grub/grub.conf b/config/grub/grub.conf index 553b10d..2199bf1 100644 --- a/config/grub/grub.conf +++ b/config/grub/grub.conf @@ -14,28 +14,8 @@ title IPFire 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 panic=10 vga=785 MOUNT - initrd /ipfirerd-KVER.img - savedefault 1 -title IPFire (vesafb 800x600) - root (hd0,0) - 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 panic=10 vga=791 MOUNT initrd /ipfirerd-KVER.img - savedefault 3 -title IPFire (acpi disabled) - root (hd0,0) - 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 panic=10 nosmp MOUNT - initrd /ipfirerd-KVER.img - savedefault 5 + savedefault 1 diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index ea47593..319dfde 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -375,7 +375,7 @@ int main(int argc, char *argv[]) errorbox(ctr[TR_UNABLE_TO_PARTITION]); goto EXIT; } - + if (fstype == EXT2) { // mysystem("/sbin/modprobe ext2"); sprintf(mkfscommand, "/sbin/mke2fs -T ext2"); @@ -517,7 +517,7 @@ int main(int argc, char *argv[]) */ FILE *f = NULL; if (f = fopen("/harddisk/boot/grub/device.map", "w")) { - fprintf(f, "(hd0) %s\n", hdparams.devnode_part); + fprintf(f, "(hd0) %s\n", hdparams.devnode_disk); fclose(f); }

diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh index 8e2b600..749d4fa 100644 --- a/src/install+setup/install/mountdest.sh +++ b/src/install+setup/install/mountdest.sh @@ -18,6 +18,10 @@ # # ###############################################################################

+# Set histchars to an empty string so we are able to replace an +# exclamation mark. +histchars= + echo "Scanning for possible destination drives"

function _mount() { @@ -70,6 +74,9 @@ for path in /sys/block/*; do ;; esac

+ # Replace any exclamation marks (e.g. cciss!c0d0). + device=${device//!//} + # Guess if this could be a raid device. for dev in ${device} ${device}p1; do if [ -e "/dev/${dev}" ]; then @@ -93,7 +100,7 @@ for path in /sys/block/*; do # 2: RAID # 10: nothing found case "${device}" in - *p1) + *p1|*c0d0) exit 2 ;; *)

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