From 7c699d32c2f0b97a65f423f219e15d09c7d88003 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 17 Oct 2015 09:59:25 +0200
Subject: installer: detect cciss partitions correctly (2/2).

---
 installer.sh.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'installer.sh.in')

diff --git a/installer.sh.in b/installer.sh.in
index ee1a243..92b16f5 100644
--- a/installer.sh.in
+++ b/installer.sh.in
@@ -248,7 +248,10 @@ menu_filesystems() {
         set -- "$fstype" "$fssize" "$mntpoint" "$reformat"
         if [ -n "$1" -a -n "$2" -a -n "$3" -a -n "$4" ]; then
             local bdev=$(basename $dev)
-            if grep -Eq "^MOUNTPOINT \/dev\/${bdev}.*" $CONF_FILE; then
+            local ddev=$(basename $(dirname $dev))
+            if [ "$ddev" != "dev" ]; then
+                sed -i -e "/^MOUNTPOINT \/dev\/${ddev}\/${bdev}.*/d" $CONF_FILE
+            else
                 sed -i -e "/^MOUNTPOINT \/dev\/${bdev}.*/d" $CONF_FILE
             fi
             echo "MOUNTPOINT $dev $1 $2 $3 $4" >>$CONF_FILE
-- 
cgit 1.4.1