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

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

Author: M0...@gm...
Date: Sat Nov 22 21:38:26 2008
New Revision: 321

Modified:
    branches/iVL/.lang/MdlWinDrives.pot
    branches/iVL/MdlLilo.module

Log:
new windows detection method for LILO step

Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot	(original)
+++ branches/iVL/.lang/MdlWinDrives.pot	Sat Nov 22 21:38:26 2008
@@ -14,23 +14,23 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: MdlWinDrives.module:58
+#: MdlWinDrives.module:59
  msgid "Windows Partitions Detected"
  msgstr ""

-#: MdlWinDrives.module:74
+#: MdlWinDrives.module:75
  msgid "PARTITION"
  msgstr ""

-#: MdlWinDrives.module:84
+#: MdlWinDrives.module:85
  msgid "MOUNT TO"
  msgstr ""

-#: MdlWinDrives.module:123
+#: MdlWinDrives.module:124
  msgid "Do not mount"
  msgstr ""

-#: MdlWinDrives.module:190
+#: MdlWinDrives.module:193
  msgid "No Windows partitions detected"
  msgstr ""


Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Sat Nov 22 21:38:26 2008
@@ -382,6 +382,7 @@
    DIM i, ii AS Integer
    DIM sTmpMountPoint AS String = "/tmp/lilo_tmp"
    DIM hproc AS Process
+  DIM sLook AS String
    ME.arrWinBootChecks = NEW Object[]
    ME.arrWinNameTxtBoxes = NEW Object[]

@@ -396,7 +397,15 @@
                              EXEC ["umount", sPartition] WAIT
                              EXEC ["mount", sPartition, sTmpMountPoint] WAIT
                      END IF
-                        IF Exist(sTmpMountPoint &/ "*winnt*"  
&/ "*system32*" &/ "*winver.exe*") OR IF Exist(sTmpMountPoint  
&/ "*WINDOWS*" &/ "*system32*" &/ "*winver.exe*") OR IF  
IsDir(sTmpMountPoint &/ "*winnt*") THEN
+                        'IF Exist(sTmpMountPoint &/ "*winnt*"  
&/ "*system32*" &/ "*winver.exe*") OR IF Exist(sTmpMountPoint  
&/ "*WINDOWS*" &/ "*system32*" &/ "*winver.exe*") OR IF  
IsDir(sTmpMountPoint &/ "*winnt*") THEN
+                        'IF Exist(sTmpMountPoint &/ "*[winnt]*"  
&/ "*[system32]*"
+                            FOR EACH sLook IN  
Dir(sTmpMountPoint, "*[win]*", gb.Directory)
+                              IF Stat(sTmpMountPoint &/ sLook).Type =  
gb.Directory THEN
+                                IF sLook LIKE "winnt" OR IF sLook  
LIKE "windows" THEN
+
+
+'                        IF Exist(sTmpMountPoint &/ LIKE "winnt" &/  
LIKE "system32" &/ LIKE "winver") THEN
+
                              'Message(sPartition & " has a windows install")
                              WITH FrmLiloSetup.tsLIloTabs
                                .Index = .Count - 1
@@ -407,7 +416,10 @@
                                  ME.FILL_IN_WINDOWS_TAB("Windows",  
sPartition)

                          END IF
-
+
+                        END IF
+'                      END IF
+                  NEXT


                      EXEC ["sync"] WAIT