Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r474 - branches/iVL
|
From: <cod...@go...> - 2009-01-26 03:02:26
|
Author: uelsk8s
Date: Sun Jan 25 18:46:11 2009
New Revision: 474
Modified:
branches/iVL/.project
branches/iVL/ClsPartSel.class
branches/iVL/FrmPkgSel.form
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
installer working with seperate boot partition
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Sun Jan 25 18:46:11 2009
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.31
+Version=0.1.35
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/ClsPartSel.class
==============================================================================
--- branches/iVL/ClsPartSel.class (original)
+++ branches/iVL/ClsPartSel.class Sun Jan 25 18:46:11 2009
@@ -17,9 +17,9 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
-STATIC PUBLIC sRoot AS String
+STATIC PUBLIC sRoot AS String '= "/dev/hdd4"
STATIC PUBLIC fRoot AS String
-STATIC PUBLIC sBoot AS String
+STATIC PUBLIC sBoot AS String '= "/dev/hdb8"
STATIC PUBLIC fBoot AS String
STATIC PUBLIC sHome AS String
STATIC PUBLIC fhome AS String
Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form (original)
+++ branches/iVL/FrmPkgSel.form Sun Jan 25 18:46:11 2009
@@ -12,12 +12,13 @@
MoveScaled(34,6,20,1)
}
{ rbFull RadioButton
- MoveScaled(1,10,40,3.1429)
+ MoveScaled(1,10,40,3.125)
Text = ("Full Install")
}
{ rbCustom RadioButton
- MoveScaled(1,14,55,3.1429)
+ MoveScaled(1,14,55,3.125)
Text = ("Custom Install")
+ Value = True
}
{ tlActionDesc TextLabel
MoveScaled(1,19,63,4)
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Sun Jan 25 18:46:11 2009
@@ -325,8 +325,12 @@
TRY MKDIR ClsGlobal.sTargetMnt &/ "boot"
TRY MKDIR ClsGlobal.sTargetMnt &/ "boot" &/ "tamu"
'TRY MKDIR ClsGlobal.sTargetMnt &/ "etc"
-
-
+ FOR EACH cbox IN MdlPartsel.OMountPoints
+ IF cbox.text = "/boot" THEN
+ SHELL "mount " & cbox.tag & " /mnt/target/boot" WAIT
+ END IF
+ NEXT
+
FOR EACH cb IN MdlLilo.arrLinuxIncCheckboxes
IF cb.Value = TRUE THEN
sPart = Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
@@ -400,32 +404,34 @@
SHELL "fdisk -l |grep -E \'83 *Linux\' | cut -f 1 -d \' \'" TO sDump
+ 'sDump = "hdd4"
sDump = Trim(sDump)
sPartitions = Split(sDump, gb.NewLine)
TRY MKDIR "/tmp/lilo_tmp"
FOR i = 0 TO sPartitions.Count - 1
sLinuxPart = Trim(sPartitions[i])
sPart = Right(sLinuxpart, Len(sLinuxPart) -
RInStr(sLinuxPart, "/"))
- EXEC ["mount", "/dev/" & sPart, "/tmp/lilo_tmp"] WAIT
-
- IF IsDir("/tmp/lilo_tmp/boot") THEN
- IF sPart = ClsPartSel.sRoot THEN
- sOsDesc = "VectorLinux"
+ IF "/dev/" & sPart <> ClsPartSel.sBoot THEN
+ IF IsDir("/tmp/lilo_tmp") THEN
+ IF "/dev/" & sPart = ClsPartSel.sRoot
THEN
+ sOsDesc = "VectorLinux"
+ sKernelLoc = "/mnt/target/boot"
ELSE
- 'FOR EACH vmlinuz IN
Dir("/tmp/lilo_tmp/boot", "vmlinuz*", gb.File)
- sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
- END IF
- 'Message(sOsDesc)
+ EXEC ["mount", "/dev/" &
sPart, "/tmp/lilo_tmp"] WAIT
+ 'FOR EACH vmlinuz IN
Dir("/tmp/lilo_tmp/boot", "vmlinuz*", gb.File)
+ sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
+ 'Message(sOsDesc)
IF sOsDesc LIKE "vector" THEN
sKernelLoc = "/tmp/lilo_tmp/boot"
ELSE
sKernelLoc = "/tmp/lilo_tmp"
END IF
+ END IF
FOR EACH vmlinuz IN
Dir(sKernelLoc, "vmlinuz")
'IF Stat("/tmp/lilo_tmp/boot" &/
vmlinuz).Type <> 6
'sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
'sOsDesc =
Replace(vmlinuz, "vmlinuz", sOsDesc)
-
+ PRINT sPart
'Message(Stat("/tmp/lilo_tmp" &/
vmlinuz).Type)
WITH FrmLiloSetup
.tsLIloTabs.Index
= .tsLIloTabs.Count - 1
@@ -438,8 +444,8 @@
'END IF
NEXT
END IF
-
- EXEC ["umount", "/tmp/lilo_tmp"] WAIT
+ EXEC ["umount", "/tmp/lilo_tmp"] WAIT
+ ENDIF
NEXT
END
@@ -563,14 +569,7 @@
END
-
-
-
-
-
-
-
- PUBLIC SUB FILL_IN_LINUX_TAB(sDesc AS String, sHostPart AS String)
+PUBLIC SUB FILL_IN_LINUX_TAB(sDesc AS String, sHostPart AS String)
DIM tb AS TextBox
DIM cb AS CheckBox
@@ -582,14 +581,17 @@
DIM sInitrdLoc AS String
'DIM i AS Integer
'DIM sKernelStr AS String
- IF sDesc LIKE "vector" THEN
+ IF sHostPart = ClsPartSel.sRoot THEN
+ sInitrdLoc = "/mnt/target/boot"
+ ELSE IF sDesc LIKE "vector" THEN
sInitrdLoc = "/tmp/lilo_tmp/boot"
ELSE
sInitrdLoc = "/tmp/lilo_tmp"
END IF
'Message(sInitrdLoc)
-
-
+ PRINT sHostPart
+ PRINT ClsPartSel.sRoot
+ PRINT "testing LILO"
INC i
x = 4
y = 12
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
