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

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

Author: M0...@gm...
Date: Wed Aug 13 15:03:42 2008
New Revision: 120

Modified:
    branches/iVL/.lang/#project.pot
    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/MdlInstallSys.module

Log:
- Attempt to fix the problem where fstab was printing "do not format" as  
the partition type on some partitions.
   this is done by cycling trhough the partitions and detecting each  
partitions format using fdisk

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/.project
+# /home/moises/area-51/projects/installer/.project
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsGlobal.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsPartSel.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsWinDrives.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmDiskPart.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmLicense.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartScheme.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartSel.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPkgSel.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSelISO.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSummary.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmWinDrives.class
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlCore.module
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlDiskPart.module
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlObjSizer.module
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPartSel.module
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPkgSel.module
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSetup.module
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSummarize.module
+# /home/moises/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	Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlWinDrives.module
+# /home/moises/area-51/projects/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Wed Aug 13 15:03:42 2008
@@ -82,10 +82,53 @@
    DIM sPartition AS String
    DIM sMountPoint AS String
    DIM sMntOpts AS String
-  DIM i AS Integer
+  DIM i, ii AS Integer
    DIM sWinPart AS String
    DIM sWinMntPnt AS String
    DIM sFstab AS String
+  DIM sPartFmt AS String
+
+
+
+
+
+
+
+  ' MAKE SURE THE PARTITIONS TYPES ARE DETECTED CORRECTLY
+
+    IF ClsPartSel.fRoot LIKE "do not format" THEN
+    SHELL "part=$(parted " & Left(ClsPartSel.sRoot, Len(ClsPartSel.sRoot)  
- 1) & " print | grep &\' " & Right(ClsPartSel.sroot) & "\' ; echo $part |  
cut -f 6 -d \' \'" TO sPartFmt
+      sPartFmt = Trim(sPartFmt)
+      ClsPartSel.fRoot = sPartFmt
+    END IF
+        IF ClsPartSel.sHome AND ClsPartSel.fhome LIKE "do not format" THEN
+    SHELL "part=$(parted " & Left(ClsPartSel.sHome, Len(ClsPartSel.sHome)  
- 1) & " print | grep &\' " & Right(ClsPartSel.sHome) & "\' ; echo $part |  
cut -f 6 -d \' \'" TO sPartFmt
+      sPartFmt = Trim(sPartFmt)
+      ClsPartSel.fhome = sPartFmt
+    END IF
+        IF ClsPartSel.fUsr AND ClsPartSel.fUsr LIKE "do not format" THEN
+    SHELL "part=$(parted " & Left(ClsPartSel.sUsr, Len(ClsPartSel.sUsr) -  
1) & " print | grep &\' " & Right(ClsPartSel.sUsr) & "\' ; echo $part | cut  
-f 6 -d \' \'" TO sPartFmt
+      sPartFmt = Trim(sPartFmt)
+      ClsPartSel.fUsr = sPartFmt
+    END IF
+    IF ClsPartSel.fVar AND ClsPartSel.fVar LIKE "do not format" THEN
+    SHELL "part=$(parted " & Left(ClsPartSel.sVar, Len(ClsPartSel.sVar) -  
1) & " print | grep &\' " & Right(ClsPartSel.sVar) & "\' ; echo $part | cut  
-f 6 -d \' \'" TO sPartFmt
+      sPartFmt = Trim(sPartFmt)
+      ClsPartSel.fVar = sPartFmt
+    END IF
+    IF ClsPartSel.fOpt AND ClsPartSel.fOpt LIKE "do not format" THEN
+    SHELL "part=$(parted " & Left(ClsPartSel.sOpt, Len(ClsPartSel.sOpt) -  
1) & " print | grep &\' " & Right(ClsPartSel.sOpt) & "\' ; echo $part | cut  
-f 6 -d \' \'" TO sPartFmt
+      sPartFmt = Trim(sPartFmt)
+      ClsPartSel.fOpt = sPartFmt
+    END IF
+    IF ClsPartSel.fTmp AND ClsPartSel.fTmp LIKE "do not format" THEN
+    SHELL "part=$(parted " & Left(ClsPartSel.sTmp, Len(ClsPartSel.sTmp) -  
1) & " print | grep &\' " & Right(ClsPartSel.sTmp) & "\' ; echo $part | cut  
-f 6 -d \' \'" TO sPartFmt
+      sPartFmt = Trim(sPartFmt)
+      ClsPartSel.fTmp = sPartFmt
+
+    END IF
+
+

    ' make the changes show up on the steps now
    FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"
@@ -105,8 +148,11 @@
  "#not be checked(such AS MS - initrd / mnt OR NFS file systems)a 0.\n\n\n"  
&
  "#The Linux partitions\n"

+
+
  sFstab = sFstab & gb.NewLine &
  ClsPartSel.sRoot & " / " & LCase(ClsPartSel.fRoot) & " " &  
ME.fS_oPTIONS(LCase(ClsPartSel.fRoot)) & " 0 1" & gb.NewLine
+
  IF ClsPartSel.sHome THEN
    sFstab = sFstab & gb.NewLine & ClsPartSel.sHome & " /home " &  
LCase(ClsPartSel.fhome) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fhome)) & "  
0 2"
  END IF