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

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

Author: M0...@gm...
Date: Thu Dec  4 07:15:17 2008
New Revision: 357

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

Log:
Fixed lilo problem when no initrd was selected

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Dec  4 07:15:17 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.35
+Version=0.1.36
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -12,7 +12,6 @@
  Library=gb.gtk.ext
  Description=GUI installer for Vector linux
  Authors=M0E-lnx\nuelsk8s
-Arguments="-C"
  TabSize=2
  Translate=1
  Language=en_US

Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Thu Dec  4 07:15:17 2008
@@ -194,9 +194,12 @@
            sSection = "image = " & sBootPath &/ sKernel & "\n" &
            "root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)  
& "\n" &
            "label = " & sLabel & "\n" &
-          "append = \"" & sAppend & "\"" & "\n" &
-          "initrd = " & sInitrd & "\n" & ' sBootPath &/ sInitrd & "\n" &
-          "read-only" & "\n"
+          "append = \"" & sAppend & "\"" & "\n"
+          IF sInitrd <> "noinitrd" THEN
+            sSection = sSection & "initrd = " & sInitrd & "\n"  '  
sBootPath &/ sInitrd & "\n"
+          END IF
+          sSection = sSection & "read-only" & "\n"
+
                FOR EACH chbox IN ME.arrLinuxTextBoots
                  IF chbox.Value = TRUE THEN
                      IF chbox.tag = cb.Tag THEN
@@ -209,9 +212,9 @@
                      sClisection = "image = " & sBootPath &/ sKernel & "\n"  
&
            "root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)  
& "\n" &
            "label = " & sLabel & "-tui" & "\n" &
-          "append = \"2 splash=verbose\"" & "\n" &
-          "initrd = " & sInitrd & "\n" & '& sBootPath &/ sInitrd & "\n" &
-          "read-only" & "\n"
+          "append = \"2 splash=verbose\"" & "\n"
+            IF sInitrd <> "noinitrd" THEN sClisection = sClisection  
& "initrd = " & sInitrd & "\n"  '& sBootPath &/ sInitrd & "\n"
+            sClisection = sClisection & "read-only" & "\n"
                        ' sClisection = sSection
                        ' sClisection = Replace(sClisection, "append = " &  
sAppend, "append = \"2 splash=verbose\"")
                        ' sClisection = Replace(sClisection, "label = " &  
sLabel, "label = " & sLabel & "-cli") & "\n"

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