vectorlinux-devel

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

Author: M0...@gm...
Date: Thu Dec  4 07:45:11 2008
New Revision: 358

Modified:
    branches/iVL/.project
    branches/iVL/FrmNetConf.class
    branches/iVL/MdlLilo.module
    branches/iVL/MdlPartSel.module
    branches/iVL/MdlSetup.module
    branches/iVL/installer.gambas

Log:
Fixed annoyance where it asks to import accounts when no /home was selected

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Dec  4 07:45:11 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.36
+Version=0.1.37
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class	(original)
+++ branches/iVL/FrmNetConf.class	Thu Dec  4 07:45:11 2008
@@ -49,6 +49,7 @@

      WITH FMain
      .tvPlan["Conf3"].Picture = MdlCore.sDonePic
+    .tvPlan["Conf2"].Picture = MdlCore.sDonePic
      .tvPlan["Conf4"].Picture = MdlCore.sNowPic
      .tvPlan["Conf4"].Selected = TRUE
    END WITH

Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Thu Dec  4 07:45:11 2008
@@ -37,7 +37,7 @@
    'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
    IRET = MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
      RETURN IRET
-  'MdlCore.warn_status_off()
+  MdlCore.warn_status_off()

  END

@@ -146,7 +146,7 @@
    DIM sBootPath, sHeader, sFile, sVidModeSection AS String

     'Message.Info(ClsPartSel.sRoot)
-
+   MdlCore.WARN_STATUS("")
        FOR EACH cb IN arrLinuxIncCheckboxes


@@ -285,7 +285,7 @@
      DIM sKernelPath, sPart, sShortpart AS String
      DIM sKernel, sInitrd, sKernelLoc AS String

-
+    MdlCore.WARN_STATUS("")
      ' PREPARE HOST PARTITION
        'EXEC ["mount", "/dev/sdb8", "/mnt/target"] WAIT
        EXEC ["mount", ClsPartSel.sRoot, "/mnt/target"] WAIT
@@ -347,6 +347,7 @@
  END IF
  NEXT
  'EXEC ["umount", "/mnt/target"] WAIT
+MdlCore.warn_status_off()
  END



Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Thu Dec  4 07:45:11 2008
@@ -420,6 +420,7 @@
    MdlCore.WARN_STATUS("")
      FOR EACH cb IN oMountPoints
        IF cb.Text = "/" THEN ClsPartSel.sRoot = cb.Tag
+      IF cb.Text = "/home" THEN ClsPartSel.sHome = cb.Tag
          FOR EACH cc IN oFsTypes
            IF cb.tag = cc.tag THEN
              ME.SET_PARTITION_FORMAT(cb.text, cc.Text)

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Thu Dec  4 07:45:11 2008
@@ -325,6 +325,10 @@
  PUBLIC FUNCTION SCAN_HOME_DIRS(sHomePartition AS String) AS String

    DIM sDump AS String
+
+  IF NOT ClsPartSel.sHome THEN RETURN ""
+  IF ClsPartSel.sRoot = ClsPartSel.sHome THEN RETURN ""
+
      SHELL "ls " & sHomePartition & " | grep -v ftp | grep -v lost+found |  
grep -v .*" TO sDump

      sDump = Trim(sDump)

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