about summary refs log tree commit diff
path: root/installer.sh.in
diff options
context:
space:
mode:
authorJuan RP <xtraeme@voidlinux.eu>2015-10-17 09:59:25 +0200
committerJuan RP <xtraeme@voidlinux.eu>2015-10-17 09:59:25 +0200
commit7c699d32c2f0b97a65f423f219e15d09c7d88003 (patch)
treea310e68bed09a5fcf392b59b417e1e09446286a5 /installer.sh.in
parentd0f0910b6738b175d2ecc6fdbf6515927cd9d81e (diff)
downloadhrmpf-7c699d32c2f0b97a65f423f219e15d09c7d88003.tar.gz
hrmpf-7c699d32c2f0b97a65f423f219e15d09c7d88003.tar.xz
hrmpf-7c699d32c2f0b97a65f423f219e15d09c7d88003.zip
installer: detect cciss partitions correctly (2/2).
Diffstat (limited to 'installer.sh.in')
-rw-r--r--installer.sh.in5
1 files changed, 4 insertions, 1 deletions
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