Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r549 - - Cleanup up installation module of all un-used code.
|
From: <cod...@go...> - 2009-05-14 21:24:57
|
Author: M0...@gm...
Date: Thu May 14 14:24:25 2009
New Revision: 549
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/Conf0.class
branches/speedy/MdlMain.module
branches/speedy/Step9.class
Log:
- Cleanup up installation module of all un-used code.
- Added (buggy) code to install kernel and initrd.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu May 14 14:24:25 2009
@@ -54,102 +54,102 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:360 Step1.class:434 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:359 Step1.class:434 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:144
msgid "WARNING:"
msgstr ""
-#: Conf0.class:360
+#: Conf0.class:359
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:360
+#: Conf0.class:359
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:360
+#: Conf0.class:359
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:435
+#: Conf0.class:512
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:442
+#: Conf0.class:520
msgid "Offer"
msgstr ""
-#: Conf0.class:442
+#: Conf0.class:520
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:478
+#: Conf0.class:557
msgid "Title"
msgstr ""
-#: Conf0.class:500
+#: Conf0.class:579
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:556
+#: Conf0.class:635
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:565
+#: Conf0.class:644
msgid "Boot this operating system by default"
msgstr ""
-#: Conf0.class:680
+#: Conf0.class:759
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:696
+#: Conf0.class:775
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:705
+#: Conf0.class:784
msgid "LILO"
msgstr ""
-#: Conf0.class:712
+#: Conf0.class:791
msgid "GRUB"
msgstr ""
-#: Conf0.class:718
+#: Conf0.class:797
msgid "NONE"
msgstr ""
-#: Conf0.class:727
+#: Conf0.class:806
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:737
+#: Conf0.class:816
msgid "Target"
msgstr ""
-#: Conf0.class:749
+#: Conf0.class:828
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:768
+#: Conf0.class:847
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:779
+#: Conf0.class:858
msgid "Seconds"
msgstr ""
-#: Conf0.class:786
+#: Conf0.class:865
msgid "Boot Default"
msgstr ""
-#: Conf0.class:809
+#: Conf0.class:888
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:825
+#: Conf0.class:904
msgid "Tab 0"
msgstr ""
@@ -244,7 +244,7 @@
msgid "When finished, Click"
msgstr ""
-#: Conf3.class:47 MdlMain.module:502 Step3a1a.class:177 Step3a2.class:359
+#: Conf3.class:47 MdlMain.module:514 Step3a1a.class:177 Step3a2.class:359
#: Step3a3a.class:72 Step5.class:177
msgid "to continue"
msgstr ""
@@ -666,55 +666,59 @@
msgid "Problem while installing"
msgstr ""
-#: MdlMain.module:382
+#: MdlMain.module:425
msgid "Preparing system partitions"
msgstr ""
-#: MdlMain.module:384
+#: MdlMain.module:427
msgid "An error occurred while preparing partitions. Unable to continue"
msgstr ""
-#: MdlMain.module:392
+#: MdlMain.module:435
msgid "Error during installation of required software. Unable to continue"
msgstr ""
-#: MdlMain.module:440
+#: MdlMain.module:483
msgid "Unable to install contents of"
msgstr ""
-#: MdlMain.module:440
+#: MdlMain.module:483
msgid "Cannot continue"
msgstr ""
-#: MdlMain.module:502
+#: MdlMain.module:514
msgid "Installation is complete. Click"
msgstr ""
-#: MdlMain.module:504
+#: MdlMain.module:516
msgid "Installation complete... Click"
msgstr ""
-#: MdlMain.module:504
+#: MdlMain.module:516
msgid "to continue."
msgstr ""
-#: MdlMain.module:524
+#: MdlMain.module:518
+msgid "Error while installing kernels and initrds"
+msgstr ""
+
+#: MdlMain.module:541
msgid "Unable to install the components of"
msgstr ""
-#: MdlMain.module:524
+#: MdlMain.module:541
msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:591
+#: MdlMain.module:624
msgid "Installing"
msgstr ""
-#: MdlMain.module:591
+#: MdlMain.module:624
msgid "Part of"
msgstr ""
-#: MdlMain.module:593
+#: MdlMain.module:626
msgid "Error installing"
msgstr ""
@@ -1620,14 +1624,18 @@
msgid "Install User-Selected Software"
msgstr ""
-#: Step9.class:145
+#: Step9.class:89
+msgid "Something went wrong during installation. Please try again"
+msgstr ""
+
+#: Step9.class:153
msgid "Installation in progress"
msgstr ""
-#: Step9.class:224
+#: Step9.class:232
msgid "Install Process"
msgstr ""
-#: Step9.class:240
+#: Step9.class:248
msgid "The development Crew"
msgstr ""
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Thu May 14 14:24:25 2009
@@ -54,99 +54,99 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:360
+#: Conf0.class:359
msgid "WARNING:"
msgstr ""
-#: Conf0.class:360
+#: Conf0.class:359
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:360
+#: Conf0.class:359
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:360
+#: Conf0.class:359
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:435
+#: Conf0.class:512
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:442
+#: Conf0.class:520
msgid "Offer"
msgstr ""
-#: Conf0.class:442
+#: Conf0.class:520
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:478
+#: Conf0.class:557
msgid "Title"
msgstr ""
-#: Conf0.class:500
+#: Conf0.class:579
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:556
+#: Conf0.class:635
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:565
+#: Conf0.class:644
msgid "Boot this operating system by default"
msgstr ""
-#: Conf0.class:680
+#: Conf0.class:759
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:696
+#: Conf0.class:775
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:705
+#: Conf0.class:784
msgid "LILO"
msgstr ""
-#: Conf0.class:712
+#: Conf0.class:791
msgid "GRUB"
msgstr ""
-#: Conf0.class:718
+#: Conf0.class:797
msgid "NONE"
msgstr ""
-#: Conf0.class:727
+#: Conf0.class:806
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:737
+#: Conf0.class:816
msgid "Target"
msgstr ""
-#: Conf0.class:749
+#: Conf0.class:828
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:768
+#: Conf0.class:847
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:779
+#: Conf0.class:858
msgid "Seconds"
msgstr ""
-#: Conf0.class:786
+#: Conf0.class:865
msgid "Boot Default"
msgstr ""
-#: Conf0.class:809
+#: Conf0.class:888
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:825
+#: Conf0.class:904
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Thu May 14 14:24:25 2009
@@ -42,59 +42,63 @@
msgid "Problem while installing"
msgstr ""
-#: MdlMain.module:382
+#: MdlMain.module:425
msgid "Preparing system partitions"
msgstr ""
-#: MdlMain.module:384
+#: MdlMain.module:427
msgid "An error occurred while preparing partitions. Unable to continue"
msgstr ""
-#: MdlMain.module:392
+#: MdlMain.module:435
msgid "Error during installation of required software. Unable to continue"
msgstr ""
-#: MdlMain.module:440
+#: MdlMain.module:483
msgid "Unable to install contents of"
msgstr ""
-#: MdlMain.module:440
+#: MdlMain.module:483
msgid "Cannot continue"
msgstr ""
-#: MdlMain.module:502
+#: MdlMain.module:514
msgid "Installation is complete. Click"
msgstr ""
-#: MdlMain.module:502
+#: MdlMain.module:514
msgid "to continue"
msgstr ""
-#: MdlMain.module:504
+#: MdlMain.module:516
msgid "Installation complete... Click"
msgstr ""
-#: MdlMain.module:504
+#: MdlMain.module:516
msgid "to continue."
msgstr ""
-#: MdlMain.module:524
+#: MdlMain.module:518
+msgid "Error while installing kernels and initrds"
+msgstr ""
+
+#: MdlMain.module:541
msgid "Unable to install the components of"
msgstr ""
-#: MdlMain.module:524
+#: MdlMain.module:541
msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:591
+#: MdlMain.module:624
msgid "Installing"
msgstr ""
-#: MdlMain.module:591
+#: MdlMain.module:624
msgid "Part of"
msgstr ""
-#: MdlMain.module:593
+#: MdlMain.module:626
msgid "Error installing"
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Thu May 14 14:24:25 2009
@@ -228,17 +228,16 @@
'ME.Fake_Names()
'ME.List_Other_Linuxes(ME.TsOsList)
'ME.Update_Default_boot_choices()
+ ' Write /etc/vector-version
+ MdlMain.WRITE_ETC_VECTOR_VERSION()
+
MdlBootMngr.Display_Bootmanager_Target_Options(ME.cbTarget)
ME.PROBE_SYSTEM_FOR_OS("lilo")
ME.Timer1.Enabled = TRUE
' Update status tree
- 'MdlMain.ADVANCE_STATUS_TREE("Step4", "Step5")
MdlMain.ADVANCE_STATUS_TREE("Step5", "Step6")
- 'ClsGlobal.fRunningMainForm.listview1["Step4"].picture =
MdlStartUp.pDone
- 'ClsGlobal.fRunningMainForm.listview1["Step5"].picture =
MdlStartUp.pDone
- 'ClsGlobal.fRunningMainForm.listview1["Step6"].picture =
MdlStartUp.pNow
END
@@ -398,6 +397,80 @@
END
+
+
+
+PUBLIC FUNCTION determine_boot_parameters(sRoot AS String) AS String
+
+ ' needs to return a string[] containing the kernel, initrd, and append
lines for an OS
+ DIM sShortPart AS String = Right(sRoot, Len(sRoot) - Len("/dev/"))
+ DIM sBootPath AS String
+ DIM skernel, sinitrd, sAppend AS String
+ DIM sDump AS String
+ DIM sDumparr AS String[]
+ TRY MKDIR "/mnt/hd"
+ SHELL "mount " & sRoot & " /mnt/hd 2>/dev/null" WAIT
+
+ IF Exist("/mnt/hd/vmlinuz") THEN
+ sBootPath = "/"
+ ELSE IF Exist("/mnt/hd/boot/vmlinuz") THEN
+ sBootPath = "/boot"
+ END IF
+
+ IF NOT (sBootPath) THEN ' the above lines did not find anything
+ SHELL "ls -B /mnt/hd | grep vmlinuz" TO sDump
+ sDump = Trim(sDump)
+ IF sDump THEN
+ sBootPath = "/"
+ ELSE ' not found in the roots dir of the distro, look in /boot
+ SHELL "ls -B /mnt/hd/boot | grep vmlinuz" TO sDump
+ sDump = Trim(sDump)
+ IF sDump THEN sBootPath = "/boot"
+ END IF
+ END IF
+
+ ' now get the real path
+
+ sdump = Trim(sdump)
+ Message(sdump)
+ IF sdump THEN sDumparr = Split(Trim(sDump), gb.NewLine) ' found
something
+ ' this will either pick up the link to the default kernel,
or the first kernel that comes up from that partition.
+ IF sDumparr THEN
+ skernel = Trim(Replace(sDumparr[0], "@", ""))
+ IF skernel THEN PRINT "Found kernel " & skernel & " for " &
sRoot
+ ' now get the initrd
+ SHELL "ls -B " & sBootPath & " | grep initrd" TO sDump
+ sDump = Trim(sDump)
+ IF sDump THEN
+ sDumparr = Split(Trim(sdump), gb.NewLine) ' found something
for initrd
+ sinitrd = Trim(Replace(sDumparr[0], "@", ""))
+ IF sinitrd THEN PRINT "Found initrd " & sinitrd & " for " &
sRoot
+ END IF
+
+ TRY MKDIR ClsGlobal.sTargetPath &/ "boot" &/ "tamu"
+ TRY COPY "/mnt/hd" &/ sBootPath &/ skernel TO ClsGlobal.sTargetPath
&/ "boot" &/ "tamu" &/ skernel & "-" & sShortPart
+ TRY COPY "/mnt/hd" &/ sBootPath &/ sinitrd TO ClsGlobal.sTargetPath
&/ "boot" &/ "tamu" &/ sinitrd & "-" & sShortPart
+
+ SHELL "umount -f /mnt/hd >/dev/null" WAIT
+
+ skernel = "/boot/tamu" &/ skernel & "-" & sShortPart
+ sinitrd = "/boot/tamu" &/ sinitrd & "-" & sShortPart
+
+
+ ' IF Exist(sBootPath &/ "initrd") THEN
+ ' sinitrd = sBootPath &/ "initrd"
+ ' END IF
+ sAppend = "splash=silent" 'generic kernel arguments.
+
+ RETURN skernel & "," & sinitrd & "," & sAppend
+ 'END IF
+ ELSE
+ RETURN
+ END IF
+
+END
+
+
PUBLIC SUB PROBE_SYSTEM_FOR_OS(sBootManager AS String)
DIM sDump, sOs, sRoot, sLongDesc, sType, sTitle AS String
@@ -429,11 +502,16 @@
' /path/to/kernel, /path/to/initrd, appendline here
SHELL "/bin/linux-boot-prober " & sRoot & "
>/tmp/bootargs.lst" WAIT ' we need to hunt these arguments for every OS
found
sBootargs = MdlBootMngr.Get_OS_Boot_Params(sRoot)
+ IF NOT (sBootargs) THEN
+ DEBUG "Attempting to detect boot parameters for " & sRoot
+ sBootargs = ME.determine_boot_parameters(sRoot) ' manually
search for boot parameters.
+ END IF
IF NOT (sBootargs) THEN
- '= CAN NOT FIND BOOT ARGUMENTS FOR THIS OS ='
+ '= CAN NOT FIND BOOT ARGUMENTS FOR THIS OS ='
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< DO SOMETHING ABOUT THIS.... WE NEED
TO FIND THESE VALUES IN CASE THE PROBER FAILS >>>>>>>>>>>>>>>>>>>>>>>>>>>>
PRINT ("Unable to find boot arguments for OS in") &
Space(1) & sRoot
- RETURN
+ PRINT "WARNING: default values filled in... this might
not work"
+ 'RETURN
ELSE
sBootLine = Split(sbootargs, ",")
sKernel = sBootLine[0]
@@ -444,10 +522,11 @@
PRINT " --\\ Initrd=" & sInitrd
PRINT " --\\ Root=" & sRoot
'print " --\ Options=" &
- TsOsList.Current.Text = sRoot
+
+ END IF
+ TsOsList.Current.Text = sRoot
Populate_linux_tab(sRoot, sTitle, sKernel, sInitrd,
sAppendLine, sBootManager)
INC TsOsList.Count
- END IF
END IF
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Thu May 14 14:24:25 2009
@@ -365,6 +365,49 @@
END
+PUBLIC FUNCTION INSTALL_KERNEL_AND_INITRD() AS Integer
+
+ DIM sfile, sdump, sname, sversion AS String
+ DIM sList AS String[]
+ DIM i AS Integer
+ DIM $hproc AS Process
+
+ DEBUG "Copying kernels and intrd now ..."
+ EXEC ["mkdir", "-p", ClsGlobal.sTargetPath &/ "boot"] WAIT
+
+ SHELL "cat /mnt/source/veclinux/VINSTALL.CONF | grep ^ ISO_KERNEL_ |
cut -f 2 -d =" TO sdump
+ sdump = Trim(Replace(sdump, "\'", ""))
+ sdump = Trim(Replace(sdump, "\"", ""))
+ sList = Split(sdump, gb.NewLine)
+ FOR i = 0 TO sList.Max
+ sfile = Trim(sList[i])
+ IF Exist("/mnt/source/isolinux/kernel" &/ sfile) THEN
+ sname = sfile
+ ' find out which version this is
+ SHELL "grep \'" & sname & "\' /mnt/source/veclinux/VINSTALL.CONF
| cut -f 1 -d =" TO sdump
+ SHELL "grep \'" & Replace(sdump, "ISO", "HD") & "\'
/mnt/source/veclinux/VINSTALL.CONF | cut -f 2 -d =" TO sversion
+ sversion = Replace(sversion, "\'", "")
+ sversion = Replace(sversion, "\"", "")
+ sversion = Trim(sversion)
+ END IF
+ 'IF sversion THEN TRY COPY "/mnt/source/isolinux/kernel" &/ sfile TO
ClsGlobal.sTargetPath &/ "boot" &/ "vmlinuz-" & sversion
+ $hproc = EXEC ["cp", "/mnt/source/isolinux/kernel" &/ sfile,
ClsGlobal.sTargetPath &/ "boot" &/ "vmlinux-" & sversion] WAIT
+ IF $hproc.Value > 0 THEN
+ DEBUG "Error copying kernel " & sname & Space(1) & "(" & sversion
& ")"
+ RETURN 1
+ END IF
+ NEXT
+
+ 'TRY COPY "/mnt/source/isolinux/initrd.img" TO ClsGlobal.sTargetPath
&/ "boot" &/ "initrd"
+ $hproc = EXEC ["cp", "/mnt/source/isolinux/initrd.img",
ClsGlobal.sTargetPath &/ "boot" &/ "initrd"] WAIT
+ IF $hproc.Value > 0 THEN
+ DEBUG "Error copying initrd"
+ RETURN 1
+ END IF
+
+ RETURN 0
+END
+
PUBLIC FUNCTION INSTALL_PACKAGES(tlStatus AS TextLabel, pbProg AS
ProgressBar, iInstallType AS Integer) AS Integer
@@ -441,38 +484,7 @@
RETURN 1
BREAK
END IF
- ' ' Add the number of packages individually selected to the
count
- ' $pkgcnt = $pkgcnt + $PkgArr.Count
- '
- ' 'This will loop through each bulk definition file, read it,
and process it's contents.
- ' FOR i = 0 TO $BulkArr.Max
- ' IF Trim($BulkArr[i]) THEN
- ' PRINT " -- Installing bulk-preset " & $BulkArr[i]
- ' TRY $file = Trim(File.Load("/mnt/source/veclinux" &/
$BulkArr[i])) ' read definition file
- ' $filearr = Split($file, gb.NewLine)
- ' FOR ii = 0 TO $filearr.Max ' read each line in the
file.
- ' INC iii
- ' ' install this package
- '
- ' $path = ME.GET_PACKAGE_FULL_PATH($filearr[ii])
- ' IF $path THEN
- ' 'PRINT $path
- ' IF Exist("/mnt/source/packages" &/
Trim($path)) THEN
- ' PRINT $path
- ' tlStatus.Text = $path
- ' pbProg.Value = iii / $pkgcnt ' supposed to
update the progressbar
- ' WAIT 0.5
- ' ires =
ME.INSTALL_THIS_PACKAGE("/mnt/source/packages" &/ Trim($path))
- ' IF ires > 0 THEN
- '
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
- ' RETURN 1
- ' BREAK ' this will never get executed
- ' END IF
- ' END IF
- ' END IF
- ' 'WAIT 0.5
- ' 'pbProg.Refresh
- ' NEXT
+
END IF
NEXT
@@ -502,6 +514,11 @@
Message.Info(("Installation is complete. Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue"))
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
tlStatus.Text = ("Installation complete... Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue.")
+ IF ME.INSTALL_KERNEL_AND_INITRD > 0 THEN
+ Message.Error(("Error while installing kernels and initrds"))
+ DEBUG "Something wrong in the kernel installation module"
+ RETURN 1
+ END IF
RETURN 0
@@ -532,6 +549,12 @@
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
tlStatus.Text = ("Installation complete... Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue.")
+ IF ME.INSTALL_KERNEL_AND_INITRD > 0 THEN
+ Message.Error(("Error while installing kernels and initrds"))
+ DEBUG "Something wrong in the kernel installation module"
+ RETURN 1
+ END IF
+
RETURN 0
MINIMAL_INSTALL:
@@ -559,24 +582,34 @@
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
tlStatus.Text = ("Installation complete... Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue.")
-
- ' IF ClsGlobal.bInstallDev = TRUE THEN
- ' IF ME.INSTALL_THIS_BULK(tlStatus, pbProg, "DEV") > 0 THEN
- ' Message.Error(("Unable to install the software in the
development group. Cannot continue."))
- ' RETURN 1
- ' END IF
- ' END IF
- ' IF ClsGlobal.bInstallX11 = TRUE THEN
- ' IF ME.INSTALL_THIS_BULK(tlStatus, pbProg, "X11") > 0 THEN
- ' Message.Error(("Unable to install the software in the
Graphical Interface group. Cannot continue"))
- ' RETURN 1
- ' END IF
- ' END IF
- ' RETURN 0
+ IF ME.INSTALL_KERNEL_AND_INITRD() > 0 THEN
+ Message.Error(("Error while installing kernels and initrds"))
+ DEBUG "Something wrong in the kernel installation module"
+ RETURN 1
+ END IF
RETURN 0
END
+
+PUBLIC SUB WRITE_ETC_VECTOR_VERSION()
+
+ DIM builddate AS String
+ DIM sLine AS String
+
+ ' Get the build date from the CONF file
+ SHELL "cat /mnt/source/veclinux/VINSTALL.CONF | grep ^builddate" TO
builddate
+ IF builddate THEN builddate = Right(builddate, Len(builddate) -
InStr(builddate, "="))
+ IF builddate THEN builddate = Replace(builddate, "\"", "")
+ IF builddate THEN builddate = Replace(builddate, "\'", "")
+
+ sLine = ClsGlobal.sDistroName & Space(1) & ClsGlobal.sDistroVer &
Space(1) & "built on" & Space(1) & builddate
+ 'Message(sLine)
+ TRY File.Save("/mnt/target/etc/vector-version", sLine)
+
+END
+
+
PUBLIC FUNCTION INSTALL_THIS_BULK(tlStatus AS TextLabel, pbProg AS
ProgressBar, sBulkName AS String) AS Integer
Modified: branches/speedy/Step9.class
==============================================================================
--- branches/speedy/Step9.class (original)
+++ branches/speedy/Step9.class Thu May 14 14:24:25 2009
@@ -85,7 +85,15 @@
NEXT
' Now start the installation process
- MdlMain.INSTALL_PACKAGES(tlcurrpkg, pbinstall, ClsGlobal.iInstallMethod)
+ IF MdlMain.INSTALL_PACKAGES(tlcurrpkg, pbinstall,
ClsGlobal.iInstallMethod) > 0 THEN
+ Message.Error(("Something went wrong during installation. Please try
again"))
+ ELSE
+ ' IF IsDir(ClsGlobal.sTargetPath &/ "boot") = FALSE THEN TRY MKDIR
ClsGlobal.sTargetPath &/ "boot"
+ ' IF MdlMain.INSTALL_KERNEL_AND_INITRD() THEN
+ ' Message.Error(("Error during kernel installation. Please see error
log"))
+ ' END IF
+ END IF
+
END
|
