[Vectorlinux-devel] [vinstall-ng commit] r142 - in branches/iVL: . .lang

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

Author: M0E.lnx
Date: Mon Aug 25 09:28:45 2008
New Revision: 142

Modified:
    branches/iVL/.lang/ClsGlobal.pot
    branches/iVL/.lang/ClsPartSel.pot
    branches/iVL/.lang/ClsWinDrives.pot
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/FrmDiskPart.pot
    branches/iVL/.lang/FrmLicense.pot
    branches/iVL/.lang/FrmPartScheme.pot
    branches/iVL/.lang/FrmPartSel.pot
    branches/iVL/.lang/FrmPkgSel.pot
    branches/iVL/.lang/FrmSelISO.pot
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/.lang/FrmWinDrives.pot
    branches/iVL/.lang/MdlCore.pot
    branches/iVL/.lang/MdlDiskPart.pot
    branches/iVL/.lang/MdlObjSizer.pot
    branches/iVL/.lang/MdlPartSel.pot
    branches/iVL/.lang/MdlPkgSel.pot
    branches/iVL/.lang/MdlSetup.pot
    branches/iVL/.lang/MdlSummarize.pot
    branches/iVL/.lang/MdlWinDrives.pot
    branches/iVL/FMain.class
    branches/iVL/MdlInstallSys.module
    branches/iVL/MdlPartSel.module

Log:
- Added code to pick up any other linux partitions mounting to /mnt/xxx on
   fstab
- Added option to ignore a swap partition



Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/ClsGlobal.class
+# /home/vluser/area-51/projects/installer/ClsGlobal.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot	(original)
+++ branches/iVL/.lang/ClsPartSel.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/ClsPartSel.class
+# /home/vluser/area-51/projects/installer/ClsPartSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot	(original)
+++ branches/iVL/.lang/ClsWinDrives.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/ClsWinDrives.class
+# /home/vluser/area-51/projects/installer/ClsWinDrives.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FMain.class
+# /home/vluser/area-51/projects/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,19 +14,19 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:284
+#: FMain.class:285
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:303
+#: FMain.class:304
  msgid "Next"
  msgstr ""

-#: FMain.class:309
+#: FMain.class:310
  msgid "Back"
  msgstr ""

-#: FMain.class:315
+#: FMain.class:316
  msgid "Exit"
  msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmDiskPart.class
+# /home/vluser/area-51/projects/installer/FrmDiskPart.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot	(original)
+++ branches/iVL/.lang/FrmLicense.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmLicense.class
+# /home/vluser/area-51/projects/installer/FrmLicense.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot	(original)
+++ branches/iVL/.lang/FrmPartScheme.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmPartScheme.class
+# /home/vluser/area-51/projects/installer/FrmPartScheme.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot	(original)
+++ branches/iVL/.lang/FrmPartSel.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmPartSel.class
+# /home/vluser/area-51/projects/installer/FrmPartSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot	(original)
+++ branches/iVL/.lang/FrmPkgSel.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmPkgSel.class
+# /home/vluser/area-51/projects/installer/FrmPkgSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmSelISO.class
+# /home/vluser/area-51/projects/installer/FrmSelISO.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmSummary.class
+# /home/vluser/area-51/projects/installer/FrmSummary.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot	(original)
+++ branches/iVL/.lang/FrmWinDrives.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmWinDrives.class
+# /home/vluser/area-51/projects/installer/FrmWinDrives.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlCore.module
+# /home/vluser/area-51/projects/installer/MdlCore.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot	(original)
+++ branches/iVL/.lang/MdlDiskPart.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/area-51/projects/installer/MdlDiskPart.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot	(original)
+++ branches/iVL/.lang/MdlObjSizer.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlObjSizer.module
+# /home/vluser/area-51/projects/installer/MdlObjSizer.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot	(original)
+++ branches/iVL/.lang/MdlPartSel.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/installer/MdlPartSel.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot	(original)
+++ branches/iVL/.lang/MdlPkgSel.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlPkgSel.module
+# /home/vluser/area-51/projects/installer/MdlPkgSel.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot	(original)
+++ branches/iVL/.lang/MdlSetup.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlSetup.module
+# /home/vluser/area-51/projects/installer/MdlSetup.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot	(original)
+++ branches/iVL/.lang/MdlSummarize.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlSummarize.module
+# /home/vluser/area-51/projects/installer/MdlSummarize.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot	(original)
+++ branches/iVL/.lang/MdlWinDrives.pot	Mon Aug 25 09:28:45 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlWinDrives.module
+# /home/vluser/area-51/projects/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Mon Aug 25 09:28:45 2008
@@ -227,7 +227,7 @@


    END SELECT
-
+


    frmNext.Reparent(ME.pnlWinHost)

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Mon Aug 25 09:28:45 2008
@@ -90,6 +90,7 @@
    DIM sFstab AS String
    DIM sPartFmt AS String
    DIM cb AS ComboBox
+  DIM sRes, sDrive, sBlank, sPartNo AS String


              'FOR testing purposes
@@ -180,6 +181,26 @@
      sLinMntPnt = ClsPartSel.sLinuxPart[i]
    NEXT
  ENDIF
+
+' nOW LETS' GET THE REST OF THE PARTITIONS IN THERE
+FOR EACH CB IN MdlPartSel.oMountPoints
+
+  IF InStr(cb.text, "/mnt/") = TRUE THEN
+    sDrive = Left(cb.tag, Len("/dev/hda"))
+    sPartNo = Right(cb.tag, Len(cb.tag) - Len(sDrive))
+        IF Len(sPartNo) > 1 THEN
+          sBlank = ""
+        ELSE
+          sBlank = " "
+        END IF
+
+        SHELL "export sfmt=$(parted " & sDrive & " print | grep ^\'" &  
sBlank & sPartNo & "\'); echo $sfmt | cut -f 6 -d \' \'" TO sRes
+
+        sFstab = sFstab & gb.NewLine & cb.tag & Space(1) & cb.Text &  
Space(1) & sRes & Space(1) & ME.fS_oPTIONS(sRes) & Space(1) & " 0 2 "
+    TRY MKDIR ClsGlobal.sTargetMnt &/ cb.Text
+  END IF
+NEXT
+
  sFstab = sFstab & "\n\n" &
  "# Shared Windows/Linux partition" &
  "#/dev/hda1   /mnt/dos  msdos  umask=0   0  0 \n" &
@@ -224,8 +245,10 @@
  "# 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
+    IF cb.text <> "Not Used" THEN
      sFstab = sFstab & "\n" &
      cb.Tag & Space(1) & "none" & Space(1) & "swap" & Space(1) & "sw" &  
Space(1) & "0" & Space(1) & "0" & gb.NewLine
+    END IF
    NEXT



Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Mon Aug 25 09:28:45 2008
@@ -238,6 +238,7 @@
                        .width = tl.Width
                        .ReadOnly = TRUE
                        .Add("Swap")
+                      .Add("Not Used")
                        .tag = sPart
                      END WITH
                      y = y + cb.height + 4