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

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

Author: M0E.lnx
Date: Tue Aug 19 10:12:49 2008
New Revision: 129

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/.project
    branches/iVL/MdlConfLilo.module
    branches/iVL/MdlLiloOsList.module

Log:


Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPkgSel.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSummary.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPkgSel.module
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSummarize.module
+# /home/moe/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	Tue Aug 19 10:12:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /home/moe/area-51/projects/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Tue Aug 19 10:12:49 2008
@@ -1,6 +1,6 @@
  # Gambas Project File 2.0
  Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmLilo
  Version=0.0.33
  Library=gb.gtk
  Library=gb.form
@@ -16,7 +16,7 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
-Maintainer=benoit
-Vendor=Princeton
-Address=benoit@localhost
+Maintainer=M0E-lnx
+Vendor=VectorLinux
+Add...@gm...
  License=General Public Licence

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Tue Aug 19 10:12:49 2008
@@ -32,6 +32,11 @@
    sTrgt = Trim(FrmLilo.LiloTarget.text)
      IF InStr(sTrgt, "MBR of") THEN
        sTrgt = Right(sTrgt, Len(sTrgt) - InStr(sTrgt, "/") + 1)
+    ELSE IF FrmLilo.LiloTarget.text = "Sector" THEN
+      sTrgt = ClsPartSel.sRoot
+    ELSE IF FrmLilo.LiloTarget.text = "Floppy" THEN
+      sTrgt = "/dev/fd0"
+
      END IF

      iTimeout = FrmLilo.sbTimer.Value * 100
@@ -65,20 +70,23 @@
      ' Now we want to write the actual file to the root partition
      File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf", sOut)
        ' 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)
+    'File.Save("/etc/lilo.conf", sOut)
        ' now run lilo
-    SHELL "lilo || echo \'FAILED\'" TO sDump
-      IF InStr(sDump, "FAILED") > 0 THEN
-        Message.Error("Error while writing lilo configuration. Please boot  
the system using the <br>install disk" &
-        "And try using \'vliloconf\' once the system is running")
-      END IF
-
-
-
-


+END
+
+PUBLIC SUB EXECUTE_LILO()

+  DIM sDump AS String
+
+  SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
+  SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
+  SHELL "chroot " & ClsGlobal.sTargetMnt & "; /sbin/lilo || echo  
\'FAILED\'" TO sDump
+    IF InStr(sDump, "FAILED") > 0 THEN
+      Message.Error("Lilo returned an error. Please see below" &  
gb.NewLine & sDump)
+    END IF
+

  END


Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module	(original)
+++ branches/iVL/MdlLiloOsList.module	Tue Aug 19 10:12:49 2008
@@ -240,8 +240,12 @@
        'create a temporary monunt dir
        TRY MKDIR "/tmp/lilo_tmp"
      FOR i = 0 TO arrLinux.Count - 1
+      IF arrLinux[i] <> "" THEN
        sShortAddr = Right(arrLinux[i], Len(arrLinux[i]) -  
RInStr(arrLinux[i], "/"))
+        PRINT "scanning " & arrLinux[i]
+        PRINT "mount " & arrLinux[i] & Space(1) & "/tmp/lilo_tmp"
        SHELL "mount " & arrLinux[i] & Space(1) & "/tmp/lilo_tmp" WAIT
+
          ' now check for a vmlinuz
          IF Exist("/tmp/lilo_tmp/boot/vmlinuz") = TRUE THEN
            FrmLilo.TabStrip1.Count = FrmLilo.TabStrip1.count +  
1 'arrLinux.Count - 1
@@ -368,6 +372,7 @@
          END IF

          SHELL "umount /tmp/lilo_tmp" WAIT
+        END IF
      NEXT

      FOR i = 0 TO FrmLilo.TabStrip1.Count - 1
@@ -377,6 +382,7 @@
              FrmLilo.TabStrip1[i].Visible = FALSE
            END IF
        END WITH
+
        NEXT