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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: M0...@gm...
Date: Thu Nov 20 13:27:23 2008
New Revision: 309

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.project
    branches/iVL/FMain.class
    branches/iVL/FrmInstallSys.form
    branches/iVL/FrmUserAdd.class
    branches/iVL/MdlLilo.module
    branches/iVL/MdlNetConf.module
    branches/iVL/installer.gambas

Log:
Fixed woes in lilo and network steps

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

--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Nov 20 13:27:23 2008
@@ -14,95 +14,95 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:193
+#: FMain.class:195
  msgid "Restart"
  msgstr ""

-#: FMain.class:220
+#: FMain.class:222
  msgid "Please select a default operating system to boot before proceeding"
  msgstr ""

-#: FMain.class:221
+#: FMain.class:223
  msgid "Select an entry from this list"
  msgstr ""

-#: FMain.class:228
+#: FMain.class:230
  msgid "Skipping boot loaded setup"
  msgstr ""

-#: FMain.class:241
+#: FMain.class:243
  msgid "Passwords do not match. Please enter the same password twice"
  msgstr ""

-#: FMain.class:256
+#: FMain.class:258
  msgid "You have not created any user accounts for this system yet. There  
is not enough information"
  msgstr ""

-#: FMain.class:256
+#: FMain.class:258
  msgid "to create an account here. It is recommended that you create at  
least one."
  msgstr ""

-#: FMain.class:256
+#: FMain.class:258
  msgid "Would you like to continue anyway?"
  msgstr ""

-#: FMain.class:256
+#: FMain.class:258
  msgid "Yes"
  msgstr ""

-#: FMain.class:256
+#: FMain.class:258
  msgid "No"
  msgstr ""

-#: FMain.class:274
+#: FMain.class:276
  msgid "Please specify a hostname for this computer"
  msgstr ""

-#: FMain.class:278
+#: FMain.class:280
  msgid "Please specify the domain this computer belongs to"
  msgstr ""

-#: FMain.class:293
+#: FMain.class:295
  msgid "VectorLinux will now try to detect and configure your graphics  
hardware."
  msgstr ""

-#: FMain.class:293
+#: FMain.class:295
  msgid "Your screen may flicker or go blank for a few seconds during this  
process."
  msgstr ""

-#: FMain.class:352
+#: FMain.class:354
  msgid "Please wait while setup attampts to run the partitioning utility"
  msgstr ""

-#: FMain.class:354
+#: FMain.class:356
  msgid "Please wait while setup analyses your current partition setup."
  msgstr ""

-#: FMain.class:354
+#: FMain.class:356
  msgid "This may take a while ..."
  msgstr ""

-#: FMain.class:368
+#: FMain.class:370
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr ""

-#: FMain.class:455
+#: FMain.class:459
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:773
+#: FMain.class:784
  msgid "Back"
  msgstr ""

-#: FMain.class:785
+#: FMain.class:796
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:797
+#: FMain.class:808
  msgid "Next"
  msgstr ""

-#: FMain.class:811
+#: FMain.class:822
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Nov 20 13:27:23 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.218
+Version=0.0.219
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Thu Nov 20 13:27:23 2008
@@ -95,6 +95,8 @@
  FMain.btnext.Enabled = FALSE ' disable the button until a language is  
selected
  IF ERROR THEN Message(Error.Text & "<br>" & Error.Where)
  ME.AUTOSIZE_LEFT_PANE()
+ME.Maximized = TRUE
+
  END

  PUBLIC SUB AUTOSIZE_LEFT_PANE()
@@ -449,11 +451,14 @@
          MdlConfLilo.GENERATE_LILO_DOT_CONF()
          MdlConfLilo.GATHER_OTHER_LINUX_KERNELS_AND_INITRDS()
          MdlConfLilo.WRITE_LILO_DOT_CONF()
-        IF MdlConfLilo.EXECUTE_LILO() <> 0 THEN RETURN
+        IF MdlConfLilo.EXECUTE_LILO() <> 0 THEN
+        STOP EVENT
+        RETURN
          ELSE
            ' lilo installation / setup has been skipped
            FrmLilo.tlBanner.Text = "<b>" & ("Skipping lilo setup") & "</b>"
          END IF
+      END IF
         SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&  
/etc/rc.d/rc.udev restart"
        'frmNext = FrmLiloOsList
         frmNext = FrmZoneSet
@@ -676,5 +681,11 @@
  PUBLIC SUB tvPlan_Click()

  STOP EVENT
+
+END
+
+PUBLIC SUB PnlRight_MouseDown()
+
+

  END

Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form	(original)
+++ branches/iVL/FrmInstallSys.form	Thu Nov 20 13:27:23 2008
@@ -3,6 +3,7 @@
  { Form Form
    MoveScaled(0,0,96,74)
    Text = ("")
+  Maximized = True
    Arrangement = Arrange.Vertical
    { HPanel1 HPanel
      MoveScaled(1,1,94,10)

Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Thu Nov 20 13:27:23 2008
@@ -96,7 +96,8 @@
      END IF

      SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[^a-z0-9_-]\'" TO  
sCHAR
-    SHELL "grep -e ^" & ME.tbUsername.Text & Space(1) &  
ClsGlobal.sTargetMnt &/ "etc/passwd" TO sLogE
+    'SHELL "grep -e ^" & ME.tbUsername.Text & Space(1) &  
ClsGlobal.sTargetMnt &/ "etc/passwd" TO sLogE
+    SHELL "grep -e ^" & ME.tbUsername.Text & ": " & clsglobal.sTargetMnt  
&/ "etc" &/ "passwd" TO sLogE

     IF sCHAR <> "" THEN
        Message(("Username contains illegal characters"))

Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Thu Nov 20 13:27:23 2008
@@ -27,14 +27,15 @@
  PRIVATE i AS Integer ' used for object key


-PUBLIC SUB TRIGGER_LILO_SETUP()
+PUBLIC FUNCTION TRIGGER_LILO_SETUP() AS Integer
+  DIM IRET AS Integer

    ME.GENERATE_LILO_DOT_CONF ' Generates and write lilo.conf
    ME.COPY_KERNELS_AND_INITRDS ' copy kernels and initrs to the right place
    'Moved binding to FMain.class right after packages finish installing.
    'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
-  MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
-
+  IRET = MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
+    RETURN IRET


  END

Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Thu Nov 20 13:27:23 2008
@@ -72,7 +72,7 @@
      objIntTypes = NEW Object[]


-    'SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo  
\"$res\" | tr -s \' \'" TO seths
+    SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo  
\"$res\" | tr -s \' \'" TO seths
        'File.Save(Temp("eths"), Trim(seths))
        'Message(File.Load(Temp("eths")))


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


