[Vectorlinux-devel] [vinstall-ng commit] r137 - branches/iVL

[<cod...@go...>]

Author: M0E.lnx
Date: Thu Aug 21 14:53:04 2008
New Revision: 137

Modified:
    branches/iVL/MdlDiskPart.module
    branches/iVL/MdlInstallSys.module

Log:
- Remove old code that activated swap partition.

Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module	(original)
+++ branches/iVL/MdlDiskPart.module	Thu Aug 21 14:53:04 2008
@@ -56,20 +56,27 @@
    FrmDiskPart.tlBanner.Text = "<h3>Loading gparted ... Please wait</h3>"
    SHELL "/usr/sbin/gparted"
    WAIT 1
-    aHandle = Desktop.Find("GParted")
-      IF aHandle.count = 0 THEN
-        WAIT 1
-          aHandle = Desktop.Find("GParted")
-            IF aHandle.Count = 0 THEN
-             ' this is too much... let's try to find it using the drive  
name
-             aHandle = Desktop.Find(sType & " - GParted")
-            END IF
-      END IF
+
+      aHandle = Desktop.Find( LIKE "gparted")
+      Message(aHandle.count)
+     RETURN

-
-      'aHandle = Desktop.Find("*" & " - GParted", "gpartedbin")
-   aHandle = Desktop.Find(sType & " - GParted")
-
+   ' ' '
+   ' ' '
+   ' ' '  aHandle = Desktop.Find("GParted")
+   ' ' '    IF aHandle.count = 0 THEN
+   ' ' '      WAIT 1
+   ' ' '        aHandle = Desktop.Find("GParted")
+   ' ' '          IF aHandle.Count = 0 THEN
+   ' ' '           ' this is too much... let's try to find it using the  
drive name
+   ' ' '           aHandle = Desktop.Find(sType & " - GParted")
+   ' ' '          END IF
+   ' ' '    END IF
+   ' ' '
+   ' ' '
+   ' ' '    'aHandle = Desktop.Find("*" & " - GParted", "gpartedbin")
+   ' ' ' aHandle = Desktop.Find(sType & " - GParted")
+   ' ' '

    '     i = 0
    ' aHandle = Desktop.Find("", Trim(sWons[i]))

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Aug 21 14:53:04 2008
@@ -222,8 +222,8 @@
  "# The 'sw' option means auto activating with 'swapon -a'.\n"
    ' This will add all the swap partitions to fstab
    FOR EACH cb IN MdlPartSel.oSwaps
-    sFstab = sFstab & gb.NewLine &
-    cb.Tag & Space(1) & "none" & Space(1) & "swap" & Space(1) & "sw" *  
Space(1) & "0" & Space(1) & "0" & gb.NewLine
+    sFstab = sFstab & "\n" &
+    cb.Tag & Space(1) & "none" & Space(1) & "swap" & Space(1) & "sw" &  
Space(1) & "0" & Space(1) & "0" & gb.NewLine
    NEXT