|
From: <cod...@go...> - 2008-11-10 16:37:24
|
Author: M0E.lnx
Date: Mon Nov 10 08:36:30 2008
New Revision: 273
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/DevLog
branches/iVL/FMain.form
branches/iVL/FrmDone.class
branches/iVL/FrmSummary.class
branches/iVL/MdlNetConf.module
Log:
- Fixed bug in netconf
Was not setting /etc/HOSTNAME
- Fixed reverse navigation on package selection window.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Nov 10 08:36:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -70,39 +70,39 @@
msgid "No"
msgstr ""
-#: FMain.class:362
+#: FMain.class:363
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:366
+#: FMain.class:367
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:379
+#: FMain.class:380
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:379
+#: FMain.class:380
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:531
-msgid "Process Overview"
-msgstr ""
-
-#: FMain.class:551
+#: FMain.class:541
msgid "Next"
msgstr ""
-#: FMain.class:557
+#: FMain.class:547
msgid "Back"
msgstr ""
-#: FMain.class:563
+#: FMain.class:553
msgid "Exit Installation"
msgstr ""
-#: FMain.class:579
+#: FMain.class:569
msgid "Button1"
+msgstr ""
+
+#: FMain.class:575
+msgid "Process Overview"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Mon Nov 10 08:36:30 2008
@@ -18,63 +18,63 @@
msgid "Installation Summary"
msgstr ""
-#: FrmSummary.class:16
+#: FrmSummary.class:17
msgid "Custom"
msgstr ""
-#: FrmSummary.class:20
+#: FrmSummary.class:21
msgid "Full"
msgstr ""
-#: FrmSummary.class:37
+#: FrmSummary.class:38
msgid "Partition"
msgstr ""
-#: FrmSummary.class:39
+#: FrmSummary.class:40
msgid "Size"
msgstr ""
-#: FrmSummary.class:41
+#: FrmSummary.class:42
msgid "Filesystem"
msgstr ""
-#: FrmSummary.class:43
+#: FrmSummary.class:44
msgid "Mount Point"
msgstr ""
-#: FrmSummary.class:49
+#: FrmSummary.class:50
msgid "Not Used"
msgstr ""
-#: FrmSummary.class:90
+#: FrmSummary.class:91
msgid "None"
msgstr ""
-#: FrmSummary.class:112
+#: FrmSummary.class:113
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:164
+#: FrmSummary.class:165
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:173
+#: FrmSummary.class:174
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:200
+#: FrmSummary.class:201
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:269
+#: FrmSummary.class:270
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:279
+#: FrmSummary.class:280
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:289
+#: FrmSummary.class:290
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Mon Nov 10 08:36:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Mon Nov 10 08:36:30 2008
@@ -1,2 +1,3 @@
-- Updated binary
- Ready for testing
\ No newline at end of file
+- Fixed bug in netconf
+ Was not setting /etc/HOSTNAME
+- Fixed reverse navigation on package selection window.
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Mon Nov 10 08:36:30 2008
@@ -3,15 +3,6 @@
{ Form Form
MoveScaled(0,0,100,75)
Text = ("")
- { Frame1 Frame
- MoveScaled(1,8,25,62)
- Text = ("Process Overview")
- { tvPlan TreeView
- MoveScaled(1,2,22,56)
- Expand = True
- Border = False
- }
- }
{ tlBanner TextLabel
MoveScaled(0,0,26,7)
Font = Font["+6"]
@@ -46,5 +37,14 @@
MoveScaled(16,71,10,2)
Visible = False
Text = ("Button1")
+ }
+ { Frame1 Frame
+ MoveScaled(0,7,25,62)
+ Text = ("Process Overview")
+ { tvPlan TreeView
+ MoveScaled(2,3,22,56)
+ Expand = True
+ Border = False
+ }
}
}
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Mon Nov 10 08:36:30 2008
@@ -35,7 +35,8 @@
.Text = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
- ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
+ ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
+ ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
END WITH
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Mon Nov 10 08:36:30 2008
@@ -12,7 +12,8 @@
ME.tlBanner.text = "<h3>" & ("Installation Summary") & "</h3>"
- IF ClsPkgSel.bCustom = TRUE THEN
+ 'IF ClsPkgSel.bCustom = TRUE THEN
+ IF FrmPkgSel.rbCustom.Value = TRUE THEN
ME.TextBox1.text = ("Custom")
ME.Frame2.Visible = TRUE
ME.prepare_packages_summary()
@@ -242,5 +243,12 @@
END WITH
+
+END
+
+PUBLIC SUB Form_Show()
+
+ ME.Form_Open()
+
END
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Mon Nov 10 08:36:30 2008
@@ -539,19 +539,11 @@
END
PUBLIC SUB SET_HOSTNAME(sHostName AS String, sDomain AS String)
-
- DIM sRes AS String
- SHELL "skill -n X" TO sRes
- sRes = Trim(sRes)
+
+
+ SHELL "echo " & sHostName & "." & sDomain & " >" &
ClsGlobal.sTargetMnt &/ "etc" &/ "HOSTNAME" WAIT
- EXEC ["echo ", sHostName & "." & sDomain, " >", ClsGlobal.sTargetMnt
&/ "etc" &/ "HOSTNAME"] WAIT
-
- ' ' '
- ' ' ' IF Len(sRes) > 0 THEN
- ' ' ' SHELL "echo " & sHostName & " > " & ClsGlobal.sTargetMnt
&/ "etc" &/ "HOSTNAME" WAIT
- ' ' ' ELSE ' X is not running
- ' ' ' SHELL "hostname $HOSTNAME; echo " & sHostName & " > " &
ClsGlobal.sTargetMnt &/ "etc" &/ "HOSTNAME" WAIT ' This sets the hostname
to the current CLI session and saves it for future boots
- ' ' ' END IF
+
ME.UPDATE_HOSTS_FILE(sHostName, sDomain)
|