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

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

Author: M0...@gm...
Date: Wed Dec 17 11:16:22 2008
New Revision: 421

Modified:
    branches/iVL/.project
    branches/iVL/MdlInstallCustom.module
    branches/iVL/installer.gambas

Log:
Fixed missing kernel in USB install

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Dec 17 11:16:22 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.14
+Version=0.1.15
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Wed Dec 17 11:16:22 2008
@@ -149,12 +149,14 @@
      sLabel = Left(sLabel, RInStr(sLabel, "\'") - 1)
      sKernNo = Right(sKernNo) ' this is the number of the kernel
      SHELL " cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |  
grep ^HD_KERNEL_" & sKernNo TO sFoundOut
-    sFoundOut = Trim(sFoundOut)
+    sFoundOut = Trim(Replace(sFoundOut, "\'", ""))
      sKernName = Right(sFoundOut, Len(sFoundOut) - InStr(sFoundOut, "\'"))
      sKernName = Left(sKernName, RInStr(sKernName, "\'") - 1)
      'Message.Info(sLabel & " - " & sKernName)
       'now copy the kernel to the right place
+
       sKernelPath = ClsGlobal.sSourceMnt &/ "isolinux" &/ "kernel" &/ sLabel
+      IF Exist(sKernelPath) = FALSE THEN sKernelPath =  
ClsGlobal.sSourceMnt &/ "syslinux" &/ "kernel" &/ sLabel
       IF Exist(sKernelPath) THEN
         sDump = ""
         SHELL "echo \"\" > /tmp/installdump" WAIT

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.