Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r128 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-08-18 20:02:32
|
Author: M0...@gm...
Date: Mon Aug 18 13:01:30 2008
New Revision: 128
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmLilo.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlDiskPart.module
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlSetup.module
Log:
small changes... almost ready to write lilo.conf
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Aug 18 13:01:30 2008
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:273
+#: FMain.class:274
msgid "Process Overview"
msgstr ""
-#: FMain.class:292
+#: FMain.class:293
msgid "Next"
msgstr ""
-#: FMain.class:298
+#: FMain.class:299
msgid "Back"
msgstr ""
-#: FMain.class:304
+#: FMain.class:305
msgid "Exit"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Aug 18 13:01:30 2008
@@ -1,6 +1,6 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
-Startup=FrmLilo
+Startup=MdlCore
Version=0.0.33
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Aug 18 13:01:30 2008
@@ -209,6 +209,7 @@
'POST INSTALL CONFIGURATION
CASE "FrmInstallSys"
+
frmNext = FrmLilo
CASE "FrmLilo"
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Mon Aug 18 13:01:30 2008
@@ -26,30 +26,30 @@
FMain.tvPlan["Inst2"].Picture = MdlCore.sNowPic
FMain.tvPlan["Inst2"].Selected = TRUE
+
+
+
+
- MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' formats partitions and mounts them
+ 'MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' formats partitions and mounts
them
END
PUBLIC SUB Form_Open()
-
- ' prepare the system
- 'ME.HIDE_PROGRES_CONTROLS()
- ME.tmCredits.Enabled = TRUE
-MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
-WAIT 3
+FMain.FrmCurr = ME
+ ClsGlobal.sSourceMnt = "/mnt/cdrom"
'ME.FrmProg.Text = " Preparing system for installation "
ME.tlCurrStepLbl.Text = "Current Step"
+ 'ME.show_credits
+ 'MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
+ 'ME.tmCredits.Enabled = TRUE
'STOP EVENT
-ME.BEGIN_PROCESS() ' COMMENTED FOR TESTING PURPOSES
-'MdlSetup.RUN_CREDITS("/mnt/loop/CREDIT", ME.tlCredits)
-
-
+'ME.BEGIN_PROCESS() ' COMMENTED FOR TESTING PURPOSES
@@ -111,9 +111,11 @@
+
+
DIM X AS Integer
X = ME.sclCredits.ScrollX
-
+
INC ME.sclCredits.ScrollX
IF X = ME.sclCredits.Scrollx THEN
ME.sclCredits.scrollx = 0
@@ -137,6 +139,14 @@
PUBLIC SUB tlCredits_MouseDown()
+
+
+END
+
+PUBLIC SUB Form_Menu()
+ ClsGlobal.sSourceMnt = "/mnt/cdrom"
+ MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
+ ME.tmCredits.Enabled = TRUE
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Mon Aug 18 13:01:30 2008
@@ -31,22 +31,23 @@
}
}
{ frmCredits Frame
- MoveScaled(2,47,81,8)
- Text = ("VectorLinux ... Brought to you by ")
+ MoveScaled(12,45,38,12)
+ Font = Font["-1"]
+ Text = ("")
{ sclCredits ScrollView
- MoveScaled(1,1,58,5)
+ MoveScaled(2,1,34,8)
Border = False
ScrollBar = Scroll.None
{ tlCredits TextLabel
- MoveScaled(0,0,53,4)
+ MoveScaled(2,1,30,5)
Text = ("")
Alignment = Align.Normal
}
}
}
{ tmCredits #Timer
- #X = 480
- #Y = 120
+ #X = 632
+ #Y = 80
Delay = 30
}
}
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Mon Aug 18 13:01:30 2008
@@ -148,7 +148,7 @@
PUBLIC SUB Form_Menu()
- 'MdlConfLilo.WRITE_LILO_DOT_CONF\
+
MdlConfLilo.GENERATE_LILO_DOT_CONF()
MdlConfLilo.GATHER_OTHER_LINUX_KERNELS_AND_INITRDS()
'MdlConfLilo.WRITE_LILO_DOT_CONF()
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Mon Aug 18 13:01:30 2008
@@ -27,6 +27,7 @@
DIM iTimeout AS Integer
DIM sTrgt AS String
DIM sFB AS String
+ DIM sDump AS String
sTrgt = Trim(FrmLilo.LiloTarget.text)
IF InStr(sTrgt, "MBR of") THEN
@@ -60,7 +61,19 @@
- Message(sOut)
+ 'message(sOut)
+ ' Now we want to write the actual file to the root partition
+ File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf", sOut)
+ ' to make sure the new changes are written to the MBR, we need a
copy in the local running install
+ File.Save("/etc/lilo.conf", sOut)
+ ' now run lilo
+ SHELL "lilo || echo \'FAILED\'" TO sDump
+ IF InStr(sDump, "FAILED") > 0 THEN
+ Message.Error("Error while writing lilo configuration. Please boot
the system using the <br>install disk" &
+ "And try using \'vliloconf\' once the system is running")
+ END IF
+
+
@@ -125,22 +138,24 @@
SHELL "mount " & cb.tag & Space(1) & "/mnt" &/ sShortAddr
WAIT
SHELL "ls /mnt" &/ sShortAddr &/ "boot" TO sDump
'message(sDump)
- IF Exist("/mnt/ " & sShortAddr &/ "boot" &/ sInitrd0) THEN
+
+ IF Exist("/mnt/" & sShortAddr &/ "boot" &/ sInitrd0) THEN
+
PRINT "cp /mnt" &/ sShortAddr &/ "boot" &/ sInitrd0
& " to " & ClsGlobal.sTargetMnt &/ "boot" &/ "tamu" &/ tb.text
- 'SHELL "cp /mnt" &/ sShortAddr &/ sInitrd0 & Space(1) &
ClsGlobal.sTargetMnt &/ "boot" &/ "tamu" &/ tb.text
+ SHELL "cp /mnt" &/ sShortAddr &/ sInitrd0 & Space(1) &
ClsGlobal.sTargetMnt &/ "boot" &/ "tamu" &/ tb.text
ELSE IF Exist("/mnt" &/ sShortAddr &/ "boot" &/ sInitrd1)
THEN
PRINT "cp /mnt" &/ sShortAddr &/ "boot" &/ sInitrd1 & "
to " & ClsGlobal.sTargetMnt &/ "boot" &/ "tamu" &/ tb.text
- 'SHELL "cp /mnt" &/ sShortAddr &/ sInitrd1 & Space(1) &
ClsGlobal.sTargetMnt &/ "boot" &/ "tamu" &/ tb.text
+ SHELL "cp /mnt" &/ sShortAddr &/ sInitrd1 & Space(1) &
ClsGlobal.sTargetMnt &/ "boot" &/ "tamu" &/ tb.text
ELSE
PRINT "No initrd found"
END IF
' now copy the kernel to the same location
IF Exist("/mnt" &/ sShortAddr &/ "boot" &/ "vmlinuz") THEN
PRINT "Copy /mnt" &/ sShortAddr &/ "boot" &/ "vmlinuz"
& " to " & ClsGlobal.sTargetMnt &/ "boot" &/ "tamu" &/ "vmlinuz-" &
sShortaddr
- 'SHELL "cp -L /mnt" &/ sShortAddr &/ "boot" &/ "vmlinuz"
& Space(1) & ClsGlobal.sTargetMnt &/ "boot" &/ "tamu" &/ "vmlinuz-" &
sShortAddr WAIT
+ SHELL "cp -L /mnt" &/ sShortAddr &/ "boot" &/ "vmlinuz"
& Space(1) & ClsGlobal.sTargetMnt &/ "boot" &/ "tamu" &/ "vmlinuz-" &
sShortAddr WAIT
END IF
- 'SHELL "umount /mnt" &/ sShortAddr WAIT
+ SHELL "umount /mnt" &/ sShortAddr WAIT
END IF
NEXT
END IF
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Mon Aug 18 13:01:30 2008
@@ -40,10 +40,10 @@
WAIT
i = 0
- aHandle = Desktop.Find(sWons[i])
+ aHandle = Desktop.Find(Trim(sWons[i]))
IF aHandle.Count = 0 THEN
REPEAT
- WAIT 3
+ WAIT 2
INC i
aHandle = Desktop.Find(sWons[i])
UNTIL
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Mon Aug 18 13:01:30 2008
@@ -39,7 +39,8 @@
MdlCore.LOCK_GUI()
MdlInstallSys.MOUNT_DEFINED_PARTITIONS() ' let the game begin
-
+ ' begin running the credits
+
' ' ' END IF
'MdlInstallSys.MOUNT_DEFINED_PARTITIONS
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Mon Aug 18 13:01:30 2008
@@ -220,13 +220,16 @@
ELSE
sFile[i] = sFile[i]
END IF
+ 'tlOutput.text = tlOutput.text & "<br>" & sFile[i]
+ 'tlOutput.Adjust
tlOutput.Text = tlOutput.Text & Space(12) & " *** " & sFile[i]
' tlOutput.Text = sFile[i]
'WAIT 20
NEXT
tlOutput.Width = MdlObjSizer.get_object_width(tlOutput.Text) + 24
'tlOutput.Border = Border.Plain
-
+ 'FrmInstallSys.tmCredits.Enabled = TRUE
+ 'FrmInstallSys.tmCredits.Start
END
|
