Эх сурвалжийг харах

installer: detect cciss partitions correctly (2/2).

Juan RP 9 жил өмнө
parent
commit
7c699d32c2
1 өөрчлөгдсөн 4 нэмэгдсэн , 1 устгасан
  1. 4 1
      installer.sh.in

+ 4 - 1
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