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

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

Author: M0...@gm...
Date: Wed Dec 24 08:16:00 2008
New Revision: 441

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/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/MdlInstallSys.module
    branches/iVL/installer.gambas

Log:
- Fixed bug with home partition not getting mounted
- Fixed "Do not format" string in /etc/fstab


Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/.project
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/ClsGlobal.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/ClsPartSel.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/ClsWinDrives.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FMain.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmPartScheme.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmPartSel.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmPkgSel.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmSelISO.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmSummary.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/FrmWinDrives.class
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlCore.module
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlDiskPart.module
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlObjSizer.module
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlPartSel.module
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlPkgSel.module
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlSetup.module
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlSummarize.module
+# /home/vluser/devel/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	Wed Dec 24 08:16:00 2008
@@ -1,4 +1,4 @@
-# /home/moe/devel/installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

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

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Wed Dec 24 08:16:00 2008
@@ -310,14 +310,14 @@
  EXEC ["mount", "-o", "bind", "/dev", ClsGlobal.sTargetMnt &/ "dev"] WAIT


-
-' Mount home directory for user accounts
-  FOR EACH cbox IN MdlPartSel.oMountPoints
-      IF cbox.Text = "/home" THEN
-        EXEC ["mount", CStr(cbox.Tag), ClsGlobal.sTargetMnt &/ "home"] WAIT
-      END IF
-  NEXT
-
+' ' '
+' ' ' ' Mount home directory for user accounts
+' ' '   FOR EACH cbox IN MdlPartSel.oMountPoints
+' ' '       IF cbox.Text = "/home" THEN
+' ' '         EXEC ["mount", CStr(cbox.Tag), ClsGlobal.sTargetMnt  
&/ "home"] WAIT
+' ' '       END IF
+' ' '   NEXT
+' ' '


  'We will run the commands neccisary to setup the newly installed system  
here

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Wed Dec 24 08:16:00 2008
@@ -36,28 +36,40 @@


      '/DISABLED FOR TESTING INSTALL ONLY
-    SHELL "mount " & ClsPartSel.sRoot & Space(1) & ClsGlobal.sTargetMnt  
WAIT  'moun the root partition first
-    IF ClsPartSel.sHome THEN
-       SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
-       SHELL "mount " & ClsPartSel.sHome & Space(1) & ClsGlobal.sTargetMnt  
&/ "home -t " & LCase(ClsPartSel.fhome) WAIT 'mount the home partition if  
defined
-
-    END IF
-    IF ClsPartSel.sUsr THEN
-      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "usr" WAIT
-      SHELL "mount " & ClsPartSel.sUsr & Space(1) & ClsGlobal.sTargetMnt  
&/ "usr -t" & ClsPartSel.fUsr WAIT ' mount the user partition
-    END IF
-    IF ClsPartSel.sOpt THEN
-      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "opt" WAIT
-      SHELL "mount " & ClsPartSel.sOpt & Space(1) & ClsGlobal.sTargetMnt  
&/ "opt -t " & ClsPartSel.fOpt WAIT 'mount the opt partitiong
-    END IF
-    IF ClsPartSel.sVar THEN
-      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var" WAIT
-      SHELL "mount " & ClsPartSel.sVar & Space(1) & ClsGlobal.sTargetMnt  
&/ "var -t " & ClsPartSel.fVar WAIT
-    END IF
-    IF ClsPartSel.sTmp THEN
-      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
-      SHELL "mount " & ClsPartSel.sTmp & Space(1) & ClsGlobal.sTargetMnt  
&/ "tmp -t " & ClsPartSel.fTmp WAIT
-    END IF
+    'SHELL "mount " & ClsPartSel.sRoot & Space(1) & ClsGlobal.sTargetMnt  
WAIT  'moun the root partition first
+    EXEC ["mount", ClsPartSel.sRoot, ClsGlobal.sTargetMnt] WAIT
+
+      FOR EACH cb IN MdlPartSel.oMountPoints
+        IF cb.Text <> "/" THEN
+          IF cb.Text <> ("Not Used") THEN
+            EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ cb.Text] WAIT
+            EXEC ["mount", cb.Tag, ClsGlobal.sTargetMnt &/ cb.Text] WAIT
+          END IF
+        END IF
+      NEXT
+
+    '
+    ' IF ClsPartSel.sHome THEN
+    '    SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
+    '    SHELL "mount " & ClsPartSel.sHome & Space(1) &  
ClsGlobal.sTargetMnt &/ "home -t " & LCase(ClsPartSel.fhome) WAIT 'mount  
the home partition if defined
+    '
+    ' END IF
+    ' IF ClsPartSel.sUsr THEN
+    '   SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "usr" WAIT
+    '   SHELL "mount " & ClsPartSel.sUsr & Space(1) & ClsGlobal.sTargetMnt  
&/ "usr -t" & ClsPartSel.fUsr WAIT ' mount the user partition
+    ' END IF
+    ' IF ClsPartSel.sOpt THEN
+    '   SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "opt" WAIT
+    '   SHELL "mount " & ClsPartSel.sOpt & Space(1) & ClsGlobal.sTargetMnt  
&/ "opt -t " & ClsPartSel.fOpt WAIT 'mount the opt partitiong
+    ' END IF
+    ' IF ClsPartSel.sVar THEN
+    '   SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var" WAIT
+    '   SHELL "mount " & ClsPartSel.sVar & Space(1) & ClsGlobal.sTargetMnt  
&/ "var -t " & ClsPartSel.fVar WAIT
+    ' END IF
+    ' IF ClsPartSel.sTmp THEN
+    '   SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
+    '   SHELL "mount " & ClsPartSel.sTmp & Space(1) & ClsGlobal.sTargetMnt  
&/ "tmp -t " & ClsPartSel.fTmp WAIT
+    ' END IF


        IF ClsPkgSel.bCustom = TRUE THEN
@@ -66,9 +78,9 @@
          MdlInstallSys.PERFORM_FULL_INSTALL()
        END IF

-      FOR EACH cb IN MdlPartSel.oMountPoints
-        IF Left(cb.Text, Len("/mnt")) = "/mnt" THEN EXEC ["mkdir", "-p",  
ClsGlobal.sTargetMnt &/ cb.Text] WAIT
-      NEXT
+      ' FOR EACH cb IN MdlPartSel.oMountPoints
+      '   IF Left(cb.Text, Len("/mnt")) = "/mnt" THEN EXEC ["mkdir", "-p",  
ClsGlobal.sTargetMnt &/ cb.Text] WAIT
+      ' NEXT
        MdlCore.warn_status_off
  END

@@ -148,10 +160,27 @@
               IF cb.tag = ClsPartSel.sRoot THEN
                  FOR EACH mt IN MdlPartSel.oFsTypes
                    IF mt.tag = cb.tag THEN
+                      IF mt.Text = ("Do not format") THEN
+                        SHELL "sfmt=$(parted " & sDrive & " print | grep  
^\'" & sBlank & spartNo & "\'); echo $sfmt | cut -f 6 -d \' \'" TO sRes
+                        sRes = Trim(sRes)
+                              ' Warn about inability to detect root  
partition format
+                                IF Len(sRes) = 0 THEN
+                                  Message.Warning(("Setup is unable to  
detect for current filesystem for your / partition.") & gb.NewLine &
+                                  ("Please return to the partitioning  
stage and select a filesystem for your / partition."))
+                                  RETURN 1
+                                END IF
+
+                            ' write the detected format to fstab
+                            sFstab = sFstab & "\n" &
+                            mt.Tag & Space(5) & "/" & Space(5) &  
Trim(sRes) & Space(5) & "defaults 0 1 \n"
+
+                      ELSE
+
                      sFstab = sFstab & "\n" &
                      mt.tag & Space(5) & Space(5) & "/" & Space(5) &  
Trim(mt.text) & Space(5) & "defaults 0 1" & "\n"

                    END IF
+                END IF
                  NEXT
               ELSE
              FOR EACH mt IN MdlPartSel.oFsTypes

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