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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 553b10d42d4d8469e7c3e984551393568058381d..2199bf1d895f5244ecdd53aedbfadd2d759180bb 100644 (file)
--- 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 ea47593cd30e36a8f6baa75a6221ba32de1667b6..319dfded7ea8c1489b736d9a00feef7788bcac19 100644 (file)
--- 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 8e2b600ccc5803e4830a37245c0836f797e80975..749d4fa5e8df8ee10280eae4d7f07dcb1756d031 100644 (file)
--- 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
                        ;;
                *)