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

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

Author: M0...@gm...
Date: Wed Dec 10 10:22:18 2008
New Revision: 388

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.project
    branches/iVL/FMain.class
    branches/iVL/MdlConfLilo.module
    branches/iVL/installer.gambas

Log:
Fixed path to scripts

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

--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Wed Dec 10 10:22:18 2008
@@ -34,91 +34,91 @@
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr ""

-#: FMain.class:441
+#: FMain.class:446
  msgid "You have not selected any operating systems for your boot menu."
  msgstr ""

-#: FMain.class:441
+#: FMain.class:446
  msgid "If you wish to bypass the bootloader setup, uncheck the"
  msgstr ""

-#: FMain.class:441
+#: FMain.class:446
  msgid "checkbox."
  msgstr ""

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

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

-#: FMain.class:461
+#: FMain.class:466
  msgid "Skipping boot loader setup"
  msgstr ""

-#: FMain.class:487
+#: FMain.class:492
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:503
+#: FMain.class:508
  msgid "Please enter the root password. For your security purposes, do not  
leave this blank"
  msgstr ""

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

-#: FMain.class:522
+#: FMain.class:527
  msgid "Setup has detected existing directories in the partition you  
selected for /home."
  msgstr ""

-#: FMain.class:522
+#: FMain.class:527
  msgid "Would you like to import these user accounts into your new  
Operating System"
  msgstr ""

-#: FMain.class:522
+#: FMain.class:527
  msgid "Yes"
  msgstr ""

-#: FMain.class:522
+#: FMain.class:527
  msgid "No"
  msgstr ""

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

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

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

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

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

-#: FMain.class:819
+#: FMain.class:824
  msgid "Back"
  msgstr ""

-#: FMain.class:830
+#: FMain.class:835
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:841
+#: FMain.class:846
  msgid "Next"
  msgstr ""

-#: FMain.class:855
+#: FMain.class:860
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Dec 10 10:22:18 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.21
+Version=0.1.24
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Wed Dec 10 10:22:18 2008
@@ -419,7 +419,12 @@
          frmNext = FrmPkgSel
      CASE "FrmSummary"
        '      frmNext = FrmHostPrep ' prepare host
+
        frmNext = FrmInstallSys
+      FrmCredits.Reparent(FrmInstallSys.embCredits)
+      FrmCredits.Show()
+      FrmInstallSys.embCredits.Visible = TRUE
+      MdlSetup.BEGIN_INSTALLATION()

      CASE "FrmInstallSys"
        MdlInstallSys.WRITE_NEW_DISTRO_ID()
@@ -549,7 +554,7 @@
              END IF
        END IF

-      SHELL "cp /mnt/target/etc/modules.conf >/etc/modules.conf" WAIT
+      SHELL "cp /mnt/target/etc/modules.conf /etc/modules.conf" WAIT
        SHELL "ifconfig eth0 up" WAIT
        SHELL "chmod 700 /mnt/target/home/*"
        frmNext = FrmNetConf
@@ -613,18 +618,18 @@
      '  IF ClsGlobal.sBackNav.Find(FrmCurr) = -1 THEN  
ClsGlobal.sBackNav.Add(FrmCurr)
      END IF
      END IF
-    IF frmNext.name <> "FrmInstallSys" THEN
-      frmNext.Show
-    ELSE
-      frmNext.Show
-      WAIT 1
-      FrmCredits.Reparent(FrmInstallSys.embCredits)
-      FrmCredits.Show()
-      FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
-      FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
-      FMain.tvPlan["Inst1"].Selected = TRUE
-      MdlSetup.BEGIN_INSTALLATION()
-    END IF
+    ' IF frmNext.name <> "FrmInstallSys" THEN
+    '   frmNext.Show
+    ' ELSE
+    '   frmNext.Show
+    '   WAIT 1
+    '   FrmCredits.Reparent(FrmInstallSys.embCredits)
+    '   FrmCredits.Show()
+    '   FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+    '   FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+    '   FMain.tvPlan["Inst1"].Selected = TRUE
+    '   MdlSetup.BEGIN_INSTALLATION()
+    ' END IF

    END IF
  '''END IF

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Wed Dec 10 10:22:18 2008
@@ -343,13 +343,10 @@
  "sleep 20"
  '"echo done >/tmp/status" & gb.NewLine

-EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "init"] WAIT
-EXEC ["chmod", "700", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "init"] WAIT
-EXEC ["touch", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup" &/ "init"  
&/ "config-stage2"] WAIT

-File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-vinstall-ng",  
sOut)
+File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)

-EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "init" &/ "config-vinstall-ng"] WAIT
+EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "config-vinstall-ng"] WAIT

  SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT

@@ -367,6 +364,13 @@
   "cd / && sh /var/log/scripts/x11-fonts* \n " &
   "/sbin/vxconf \n" &
   "#/sbin/config-stage1 gui-installer" & gb.NewLine
+
+
+EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "init"] WAIT
+EXEC ["chmod", "700", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "init"] WAIT
+EXEC ["touch", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup" &/ "init"  
&/ "config-stage2"] WAIT
+
+
   File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2",  
sOut)

   EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "init" &/ "config-stage2"] WAIT
@@ -374,7 +378,7 @@
  IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") THEN KILL  
ClsGlobal.sTargetMnt &/ "tmp" &/ "status"
  IF Exist("/tmp/status") THEN KILL "/tmp/status"

-hBgConfigProc = SHELL "chroot /mnt/target  
/var/log/setup/init/config-vinstall-ng ; echo Done > /tmp/status" ' FOR  
READ"
+hBgConfigProc = SHELL "chroot /mnt/target  
/var/log/setup/config-vinstall-ng ; echo Done > /tmp/status" ' FOR READ"
  'FrmDone.tmBgMon.Enabled = TRUE



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


