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

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

Author: M0...@gm...
Date: Wed Oct 15 14:33:43 2008
New Revision: 232

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/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/FrmSummary.class
    branches/iVL/MdlConfLilo.module

Log:
debugging lilo.conf

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Wed Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsGlobal.class
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsPartSel.class
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsWinDrives.class
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FMain.class
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmDiskPart.class
+# /home/remote/projects/installer/FrmDiskPart.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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmPartScheme.class
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartSel.class
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPkgSel.class
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmSelISO.class
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSummary.class
+# /home/remote/projects/installer/FrmSummary.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -31,7 +31,7 @@
  msgstr ""

  #: FrmSummary.class:39
-msgid "Size / GiB"
+msgid "Size"
  msgstr ""

  #: FrmSummary.class:41
@@ -46,35 +46,35 @@
  msgid "Not Used"
  msgstr ""

-#: FrmSummary.class:87
+#: FrmSummary.class:90
  msgid "None"
  msgstr ""

-#: FrmSummary.class:108
+#: FrmSummary.class:112
  msgid "Do not mount"
  msgstr ""

-#: FrmSummary.class:160
+#: FrmSummary.class:164
  msgid "Package Name"
  msgstr ""

-#: FrmSummary.class:169
+#: FrmSummary.class:173
  msgid "BULK PACKAGES"
  msgstr ""

-#: FrmSummary.class:186
+#: FrmSummary.class:190
  msgid "USER-SELECTED PACKAGES"
  msgstr ""

-#: FrmSummary.class:239
+#: FrmSummary.class:243
  msgid "Installation Type"
  msgstr ""

-#: FrmSummary.class:249
+#: FrmSummary.class:253
  msgid "Partition Selection Scheme"
  msgstr ""

-#: FrmSummary.class:259
+#: FrmSummary.class:263
  msgid "Software Selection"
  msgstr ""


Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot	(original)
+++ branches/iVL/.lang/FrmWinDrives.pot	Wed Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmWinDrives.class
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlCore.module
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlDiskPart.module
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlObjSizer.module
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPartSel.module
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlPkgSel.module
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlSetup.module
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlSummarize.module
+# /home/remote/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 Oct 15 14:33:43 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlWinDrives.module
+# /home/remote/projects/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class	(original)
+++ branches/iVL/FrmSummary.class	Wed Oct 15 14:33:43 2008
@@ -36,7 +36,7 @@
      ME.GridView1.Columns.count = 4
          ME.GridView1.Columns[0].text = ("Partition")
          ME.GridView1.Columns[0].Width =  
MdlObjSizer.get_object_width("/dev/hda1***")
-        ME.GridView1.Columns[1].text = ("Size / GiB")
+        ME.GridView1.Columns[1].text = ("Size")
          ME.GridView1.Columns[1].Width =  
MdlObjSizer.get_object_width(ME.GridView1.Columns[1].text) * 1.5
          ME.GridView1.Columns[2].text = ("Filesystem")
          ME.GridView1.Columns[2].Width =  
MdlObjSizer.get_object_width(("Filesystem")) * 1.25
@@ -57,7 +57,7 @@
                          IF tl.tag = cb.tag THEN
                            sSize = Mid(tl.text, InStr(tl.text, "("),  
Len(tl.text) - RInStr(tl.text, "("))
                            sSize = Trim(Replace(sSize, "(", ""))
-                          sSize = Replace(sSize, "GB", "")
+                          'sSize = Replace(sSize, "GB", "")
                          END IF
                        NEXT
                    WITH ME
@@ -71,19 +71,22 @@

                NEXT
      INC GridView1.Rows.Count
+    INC GridView1.Rows.Count
+    INC GridView1.Rows.Count
      'INC irow
        FOR EACH cb IN MdlPartSel.oSwaps
          IF cb.text <> ("Not Used") THEN
-          FOR EACH tl IN MdlPartSel.oTlSwapLbls
-            IF tl.tag = cb.tag THEN
-              sSize = Mid(tl.text, InStr(tl.text, "("), Len(tl.text) -  
RInStr(tl.text, "("))
-              sSize = Trim(Replace(sSize, "(", ""))
-              sSize = Replace(sSize, "GB", "")
-              sSize = Replace(sSize, "MB", "")
-            END IF
-          NEXT
+            FOR EACH tl IN MdlPartSel.oTlSwapLbls
+                IF tl.tag = cb.tag THEN
+                    sSize = Mid(tl.text, InStr(tl.text, "("), Len(tl.text)  
- RInStr(tl.text, "("))
+                    sSize = Trim(Replace(sSize, "(", ""))
+              'sSize = Replace(sSize, "GB", "")
+              'sSize = Replace(sSize, "MB", "")
+                END IF
+            NEXT
+
            spart = cb.Tag
-          sFsType = "swap"
+          sFsType = "Swap"
            sMountPnt = ("None")
            WITH ME
              .GridView1[irow, 0].text = sPart
@@ -96,12 +99,13 @@
              .GridView1[irow, 3].BackColor = Color.LightBackground
          END WITH
          INC irow
+        'INC GridView1.Rows.Count
        END IF
      NEXT

        IF MdlWinDrives.oWMntPoints THEN

-    INC GridView1.Rows.Count
+    'INC GridView1.Rows.Count
      INC GridView1.Rows.Count

          FOR EACH cb IN MdlWinDrives.oWMntPoints

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Wed Oct 15 14:33:43 2008
@@ -80,7 +80,7 @@
        ' to make sure the new changes are written to the MBR, we need a  
copy in the local running install
      'File.Save("/etc/lilo.conf", sOut)
        ' now run lilo
-
+  File.Save("/tmp/target_lilo.conf", sOut)

  END

@@ -90,7 +90,7 @@
    DIM sDump AS String


-  SHELL "chroot " & ClsGlobal.sTargetMnt & " /sbin/lilo || echo  
\'FAILED\'" TO sDump
+  SHELL "chroot " & ClsGlobal.sTargetMnt & " /sbin/lilo -v || echo  
\'FAILED\' " TO sDump
      IF InStr(sDump, "FAILED") > 0 THEN
        Message.Error(("Lilo returned an error. Please see below") &  
gb.NewLine & sDump)
      ELSE