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

[people/pmueller/ipfire-2.x.git] / src / install+setup / install / mountdest.sh

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
                        ;;
                *)