Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r355 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-03 22:17:23
|
Author: M0...@gm...
Date: Wed Dec 3 14:11:38 2008
New Revision: 355
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmImportAccts.class
branches/iVL/FrmImportAccts.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLilo.module
branches/iVL/MdlPartSel.module
branches/iVL/installer.gambas
Log:
Fixed lilo setup, fixed user importing module ...ready for testing
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Dec 3 14:11:38 2008
@@ -18,103 +18,103 @@
msgid "Restart"
msgstr ""
-#: FMain.class:226
+#: FMain.class:227
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:227
+#: FMain.class:228
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:234
+#: FMain.class:236
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:247
+#: FMain.class:249
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "Yes"
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "No"
msgstr ""
-#: FMain.class:280
+#: FMain.class:282
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:284
+#: FMain.class:286
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:299
+#: FMain.class:301
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:299
+#: FMain.class:301
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:351
+#: FMain.class:353
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:353
+#: FMain.class:355
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:353
+#: FMain.class:355
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:367
+#: FMain.class:369
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:439
+#: FMain.class:441
msgid "Skipping boot loader setup"
msgstr ""
-#: FMain.class:465
+#: FMain.class:467
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:489
-msgid "Setup has detected existing directories in the partition you
selected for /home. Would you like to import these "
+#: FMain.class:491
+msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:489
-msgid "user accounts into your new Operating System"
+#: FMain.class:491
+msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:813
+#: FMain.class:815
msgid "Back"
msgstr ""
-#: FMain.class:824
+#: FMain.class:826
msgid "Exit Installation"
msgstr ""
-#: FMain.class:835
+#: FMain.class:837
msgid "Next"
msgstr ""
-#: FMain.class:849
+#: FMain.class:851
msgid "Button1"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Dec 3 14:11:38 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.30
+Version=0.1.35
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 3 14:11:38 2008
@@ -212,19 +212,21 @@
' navigation for configuration
SELECT CASE FrmCurr.Name
CASE "FrmPartSel"
+ MdlPartSel.SET_LINUX_PARTITION_TYPES()
frmNext = FrmLiloSetup
-
- CASE FrmInstallSys
+ IF ERROR THEN Message.Error(Error.Where & "<br>" &
Error.Text)
+ CASE "FrmInstallSys"
frmNext = FrmLiloSetup
CASE "FrmLiloSetup"
IF FrmLiloSetup.cbYNLilo.Value = FALSE THEN
- IF FrmLiloSetup.cbBootDefault.Te ' FMain.tvPlan["Inst0"].Picture
= MdlCore.sDonePic
+ IF FrmLiloSetup.cbBootDefault.Text = "" THEN '
FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
' FMain.tvPlan["Inst1"].Selected = TRUE
'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3xt = "" THEN
Message.Warning(("Please select a default operating system
to boot before proceeding"))
Balloon.Info(("Select an entry from this list"),
FrmLiloSetup.cbBootDefault)
+ FMain.btnext.Enabled = TRUE
STOP EVENT
RETURN
END IF
@@ -485,8 +487,8 @@
' Scan home partition for user home dirs
IF Len(MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt
&/ "home")) > 0 THEN
- SELECT CASE Message.Question(("Setup has detected existing
directories in the partition you selected for /home. Would you like to
import these ") & "<br>" &
- ("user accounts into your new Operating System"), ("Yes"),
("No"))
+ SELECT CASE Message.Question(("Setup has detected existing
directories in the partition you selected for /home.") & "<br>" &
+ ("Would you like to import these user accounts into your
new Operating System"), ("Yes"), ("No"))
CASE 1
frmNext = FrmImportAccts
CASE 2
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 14:11:38 2008
@@ -112,7 +112,7 @@
DIM iTlY AS Integer
DIM hproc AS Process
- Message(sname)
+ 'Message(sname)
' Prepare group list
FOR EACH cb IN MdlUsrAdd.objGrps
Modified: branches/iVL/FrmImportAccts.form
==============================================================================
--- branches/iVL/FrmImportAccts.form (original)
+++ branches/iVL/FrmImportAccts.form Wed Dec 3 14:11:38 2008
@@ -71,8 +71,8 @@
}
{ btcancel Button
MoveScaled(26,49,14,3)
- Text = ("Cancel")
- Picture = Picture["icon:/16/cancel"]
+ Text = ("Done")
+ Picture = Picture["icon:/16/first"]
Border = False
}
{ tlBanner TextLabel
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Wed Dec 3 14:11:38 2008
@@ -101,10 +101,7 @@
Message(("Boot loader has been setup successfully"))
RETURN 0
END IF
- 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT
- 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT
- 'Message("Vectorlinux has been installed click OK to reboot")
- 'SHELL "reboot"
+
END
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Dec 3 14:11:38 2008
@@ -145,24 +145,45 @@
DIM sLabel, sKernel, sInitrd, sAppend, sTag AS String
DIM sBootPath, sHeader, sFile, sVidModeSection AS String
+ 'Message.Info(ClsPartSel.sRoot)
+
FOR EACH cb IN arrLinuxIncCheckboxes
+
+
+ ' ' This is not working well
IF Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1) =
ClsPartSel.sRoot THEN
sBootPath = "/boot"
+ sKernel = "vmlinuz"
+ 'sInitrd = "initrd"
ELSE
sBootPath = "/boot/tamu"
+ sKernel = "vmlinuz-" & Right(cb.Tag, Len(cb.Tag) -
RInStr(cb.Tag, "/"))
END IF
+
+
IF cb.Value = TRUE THEN
FOR EACH tb IN arrLinuxNametxtboxes
- IF tb.Tag = cb.Tag THEN
- sLabel = tb.Text
- sKernel = "vmlinuz-" & Right(tb.Tag, Len(tb.Tag) -
RInStr(tb.Tag, "/"))
- END IF
+
+ IF tb.Tag = cb.Tag THEN sLabel = tb.Text
+
+
NEXT
+ ' Now do the initrds
FOR EACH cbox IN arrCbInitrds
- IF cb.Tag = cbox.Tag AND cbox.Text = ("None") THEN
- sInitrd = "noinitrd"
- ELSE
- sInitrd = sBootPath &/ Trim(cbox.Text) & "-" &
Right(cbox.Tag, Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+ IF cb.Tag = cbox.Tag THEN 'AND cbox.Text = ("None") THEN
+ IF cbox.Text = ("None") THEN
+ sInitrd = "noinitrd"
+ 'ELSE
+ 'IF cb.Tag = ClsPartSel.sRoot THEN
+ 'IF Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1) =
ClsPartSel.sRoot THEN
+ 'sInitrd = "initrd"
+ ELSE
+ IF Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1) =
ClsPartSel.sRoot THEN
+ sInitrd = sBootPath &/ Trim(cbox.Text)
+ ELSE
+ sInitrd = sBootPath &/ Trim(cbox.Text) & "-" &
Right(cbox.Tag, Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+ END IF
+ END IF
END IF
NEXT
FOR EACH tb IN arrLinuxAppendtxtBoxes
@@ -241,7 +262,9 @@
IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf") THEN
TRY MOVE ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf" TO
ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf.dist"
END IF
-
+ File.Save(User.home &/ "lilo.test", sFile)
+ 'Message(sFile)
+ 'RETURN
File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf", sFile)
' write the file to the target
@@ -278,9 +301,9 @@
sShortpart = Right(sPart, Len(sPart) - RInStr(sPart, "/"))
IF sPart = ClsPartSel.sRoot THEN
- sKernelPath = "boot"
+ sKernelPath = "/boot"
ELSE
- sKernelPath = "boot/tamu"
+ sKernelPath = "/boot/tamu"
END IF
' get the initrd name
@@ -302,10 +325,14 @@
sKernelLoc = "/tmp/lilo_tmp"
END IF
' Do not copy current kernel..
- IF sShortpart <> Right(ClsPartSel.sRoot,
Len(ClsPartSel.sRoot) - InStr(ClsPartSel.sRoot, "/")) THEN
+ IF "/dev" &/ sShortpart <> ClsPartSel.sRoot THEN
+ 'IF sShortpart <> Right(ClsPartSel.sRoot,
Len(ClsPartSel.sRoot) - InStr(ClsPartSel.sRoot, "/")) THEN
' EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt
&/ "boot/tamu"] WAIT
+ IF sInitrd <> ("None")
EXEC ["cp", sKernelLoc &/ sInitrd,
ClsGlobal.sTargetMnt &/ sKernelPath &/ sInitrd & "-" & sShortpart] WAIT
+ END IF
EXEC ["cp", sKernelLoc &/ "vmlinuz",
ClsGlobal.sTargetMnt &/ sKernelPath &/ "vmlinuz-" & sShortpart] WAIT
+ 'END IF
END IF
EXEC ["sync"] WAIT
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Wed Dec 3 14:11:38 2008
@@ -417,7 +417,9 @@
DIM cb AS ComboBox
DIM cc AS ComboBox
+ MdlCore.WARN_STATUS("")
FOR EACH cb IN oMountPoints
+ IF cb.Text = "/" THEN ClsPartSel.sRoot = cb.Tag
FOR EACH cc IN oFsTypes
IF cb.tag = cc.tag THEN
ME.SET_PARTITION_FORMAT(cb.text, cc.Text)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
