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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: M0...@gm...
Date: Thu Dec 11 06:44:56 2008
New Revision: 390

Modified:
    branches/iVL/.lang/MdlCore.pot
    branches/iVL/MdlCore.module

Log:
Debugging ISO detection

Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================

--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Thu Dec 11 06:44:56 2008
@@ -18,99 +18,99 @@
  msgid "Working ... Please Wait"
  msgstr ""

-#: MdlCore.module:221
+#: MdlCore.module:251
  msgid "Scanning system for installable media. Please wait ..."
  msgstr ""

-#: MdlCore.module:237
+#: MdlCore.module:267
  msgid "No Installable Media Found"
  msgstr ""

-#: MdlCore.module:239
+#: MdlCore.module:269
  msgid "Setup was unable to find any installable media on your system.  
Please insert your VectorLinux "
  msgstr ""

-#: MdlCore.module:239
+#: MdlCore.module:269
  msgid "installation CD and click"
  msgstr ""

-#: MdlCore.module:239
+#: MdlCore.module:269
  msgid "to try again"
  msgstr ""

-#: MdlCore.module:400
+#: MdlCore.module:430
  msgid "Build Date: "
  msgstr ""

-#: MdlCore.module:400
+#: MdlCore.module:430
  msgid "MINIMUM REQUIREMENTS"
  msgstr ""

-#: MdlCore.module:405
+#: MdlCore.module:435
  msgid "Setup is unable to find SETUP.CONF in your install media. This  
could be symptoms of a bad burn or a bad ISO"
  msgstr ""

-#: MdlCore.module:478
+#: MdlCore.module:508
  msgid "Cannot find SETUP.CONF"
  msgstr ""

-#: MdlCore.module:486
+#: MdlCore.module:516
  msgid "Preparation"
  msgstr ""

-#: MdlCore.module:487
+#: MdlCore.module:517
  msgid "Language Selection"
  msgstr ""

-#: MdlCore.module:488
+#: MdlCore.module:518
  msgid "Find installation media"
  msgstr ""

-#: MdlCore.module:489
+#: MdlCore.module:519
  msgid "Disk Partitioning"
  msgstr ""

-#: MdlCore.module:490
+#: MdlCore.module:520
  msgid "Software Selection"
  msgstr ""

-#: MdlCore.module:492
+#: MdlCore.module:522
  msgid "Installation"
  msgstr ""

-#: MdlCore.module:493
+#: MdlCore.module:523
  msgid "Installation Summary"
  msgstr ""

-#: MdlCore.module:495
+#: MdlCore.module:525
  msgid "Install Operating System"
  msgstr ""

-#: MdlCore.module:496
+#: MdlCore.module:526
  msgid "System Configuration"
  msgstr ""

-#: MdlCore.module:497
+#: MdlCore.module:527
  msgid "Boot Menu Options"
  msgstr ""

-#: MdlCore.module:498
+#: MdlCore.module:528
  msgid "Regional Settings"
  msgstr ""

-#: MdlCore.module:499
+#: MdlCore.module:529
  msgid "System Administrator"
  msgstr ""

-#: MdlCore.module:500
+#: MdlCore.module:530
  msgid "User Accounts"
  msgstr ""

-#: MdlCore.module:501
+#: MdlCore.module:531
  msgid "Network Configuration"
  msgstr ""

-#: MdlCore.module:502
+#: MdlCore.module:532
  msgid "Final Hardware Configuration"
  msgstr ""


Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Thu Dec 11 06:44:56 2008
@@ -46,14 +46,13 @@
    ME.WARN_STATUS("")

    'Message(ClsGlobal.sSourceMnt)
-  SHELL "umount " & ClsGlobal.sSourceMnt WAIT
-  SHELL "mount " & sDrive & Space(1) & ClsGlobal.sSourceMnt WAIT
+  'SHELL "umount " & ClsGlobal.sSourceMnt WAIT
+  EXEC ["umount", ClsGlobal.sSourceMnt] WAIT
+  EXEC ["mount", sDrive, ClsGlobal.sSourceMnt] WAIT
+  'SHELL "mount " & sDrive & Space(1) & ClsGlobal.sSourceMnt WAIT
      SHELL "ls " & ClsGlobal.sSourceMnt & " | grep -i vl* | grep -i iso" TO  
sResults
        sResults = Trim(sResults)
-      'Message(sResults)
-          'IF sResults <> "" THEN
-          '  IF InStr(sResults, gb.NewLine) THEN 'more than one iso was  
found... do a loop for each one
-              ' this loop will mount each iso and store it's SETUP.CONF to  
a temp file
+           ' this loop will mount each iso and store it's SETUP.CONF to a  
temp file
                  sISOList = Split(sResults, gb.NewLine)
                    FOR i = 0 TO sISOList.count - 1
                      sIso = Trim(sISOList[i])
@@ -61,19 +60,22 @@
                            IF Exist("/mnt/loop") = FALSE THEN
                              MKDIR "/mnt/loop"
                            END IF
-                          SHELL "umount /mnt/loop" WAIT
-                    SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/ sISO  
& Space(1) & "/mnt/loop" WAIT
+                          'SHELL "umount /mnt/loop" WAIT
+                          EXEC ["umount", "/mnt/loop"] WAIT
+                          EXEC ["mount", "-o", "loop",  
ClsGlobal.sSourceMnt &/ sIso, "/mnt/loop"] WAIT
+                    'SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/ sISO  
& Space(1) & "/mnt/loop" WAIT
                          IF Exist("/mnt/loop/veclinux/SETUP.CONF") = TRUE  
THEN
                              IF FrmSelISO.lstInstallableImg.Find(sISO & "  
on " & sDrive) = -1 THEN
                                 File.Save(Temp(siso),  
File.Load("/mnt/loop/veclinux/SETUP.CONF"))
                                 FrmSelISO.lstInstallableImg.Add(sISO & "  
on " & sDrive)
                              END IF
                          END IF
-                    SHELL "umount /mnt/loop" WAIT
-
+                    'SHELL "umount /mnt/loop" WAIT
+                    EXEC ["umount", "/mnt/loop"] WAIT

                    NEXT
-                SHELL "umount " & ClsGlobal.sSourceMnt WAIT
+                  EXEC ["umount", ClsGlobal.sSourceMnt] WAIT
+                'SHELL "umount " & ClsGlobal.sSourceMnt WAIT

    ME.warn_status_off
  END
@@ -88,13 +90,14 @@
  DIM i AS Integer
  DIM sPartition AS String

+' THIS SUB SCANS ALL PARTITIONS (LINUX AND WINDOWS) FOR ISO IMAGES
+
  ME.WARN_STATUS("")

    SHELL "probepart | grep -v -i \'swap\' | grep -v -i \'ext\' |grep  
\'/dev\'| grep -v \'Disk\'| cut -f 1 -d \' \'" TO sResults
    'Message(sResults)
    sResults = Trim(sResults)
-  'Message.Info(sResults)
-  'IF InStr(sResults, gb.NewLine) THEN
+
      sPartList = Split(sResults, gb.NewLine)
        FOR i = 0 TO sPartList.count - 1
          sPartition = Trim(sPartList[i])
@@ -110,26 +113,53 @@

  PUBLIC SUB MEDIA_SCAN()

-  DIM sCmd AS String
-  DIM sList AS String
-  DIM sDrives AS String[]
-  DIM sDrive AS String
-  DIM sMountPoint AS String
-  DIM sDump AS String
-  DIM i AS Integer
-
-    ME.WARN_STATUS("")
-  'ClsGlobal.sSourceMnt = "/mnt/source"
-  sMountPoint = ClsGlobal.sSourceMnt
-
-  sCmd = "cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut -f 2  
-d\':\'|xargs -n 2"
-  SHELL sCmd TO sList
-  sList = Trim(sList)
-  'PRINT sList
-      IF Len(sList) < 1 THEN RETURN
-    'IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
-    sDrives = Split(sList, Space(1))
+  ' ' ' ' DIM sCmd AS String
+  ' ' ' ' DIM sList AS String
+  ' ' ' ' DIM sDrives AS String[]
+  ' ' ' ' DIM sDrive AS String
+  ' ' ' ' DIM sMountPoint AS String
+  ' ' ' ' DIM sDump AS String
+  ' ' ' ' DIM i AS Integer
+  ' ' ' '
+  ' ' ' '   ME.WARN_STATUS("")
+  ' ' ' ' 'ClsGlobal.sSourceMnt = "/mnt/source"
+  ' ' ' ' sMountPoint = ClsGlobal.sSourceMnt
+  ' ' ' '
+  ' ' ' ' sCmd = "cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut  
-f 2 -d\':\'|xargs -n 2"
+  ' ' ' ' SHELL sCmd TO sList
+  ' ' ' ' sList = Trim(sList)
+  ' ' ' ' 'PRINT sList
+  ' ' ' '     IF Len(sList) < 1 THEN RETURN
+  ' ' ' '   'IF InStr(sList, Space(1)) > 0 THEN 'there is more than one  
drive
+  ' ' ' '   sDrives = Split(sList, Space(1))

+
+DIM sCmd AS String
+DIM sResults AS String
+DIM sList AS String
+DIM sDrives AS String[]
+DIM sDrive AS String
+DIM sMountPoint AS String
+DIM sDump AS String
+DIM i AS Integer
+
+ME.WARN_STATUS("")
+'ClsGlobal.sSourceMnt = "/mnt/source"
+sMountPoint = ClsGlobal.sSourceMnt
+
+SHELL "probepart | grep -v -i \'swap\' | grep -v -i \'ext\' |grep  
\'/dev\'| grep -v \'Disk\'| cut -f 1 -d \' \'|cut -d'/' -f3" TO sResults
+'sCmd = "cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut -f 2  
-d\':\'|xargs -n 2"
+sCmd = "probedisk|cut -d\'|\' -f1|cut -d\'/\' -f3"
+SHELL sCmd TO sList
+sList = sList & Space(1) & sResults
+sList = Trim(sList)
+'PRINT sList
+IF Len(sList) < 1 THEN RETURN
+'IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
+sDrives = Split(sList, "\n")
+
+
+
        FOR i = 0 TO sDrives.count - 1
          ' this is where we loop to find SETUP.CONF in the cd
            'first, clear the mount point (using $HOME/mnt/cdrom for now)


