Menu
▾
▴
vectorlinux-devel — Vector Linux developer's list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(40) |
Apr
(76) |
May
(31) |
Jun
(39) |
Jul
(44) |
Aug
(87) |
Sep
(32) |
Oct
(23) |
Nov
(36) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(49) |
Sep
(14) |
Oct
|
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(63) |
Aug
(95) |
Sep
(39) |
Oct
(61) |
Nov
(75) |
Dec
(118) |
| 2009 |
Jan
(25) |
Feb
(37) |
Mar
(20) |
Apr
(15) |
May
(14) |
Jun
(48) |
Jul
(82) |
Aug
(160) |
Sep
(94) |
Oct
(55) |
Nov
(59) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(17) |
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <cod...@go...> - 2008-08-14 14:41:05
|
Author: M0E.lnx
Date: Thu Aug 14 07:40:27 2008
New Revision: 121
Modified:
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLiloOsList.module
Log:
- Fixed problem while detecting and listing windows partitions on the
tabstrip
- Added windows section to lilo.conf
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Thu Aug 14 07:40:27 2008
@@ -59,6 +59,9 @@
DIM sEntryLbl, sEntryApnd, sEntryRoot, sEntryInitrd, sSection AS String
DIM i AS Integer
DIM sCliSection AS String
+DIM sWinSection AS String
+
+FrmLilo.TabStrip1.Index = 0
FOR i = 0 TO FrmLilo.TabStrip1.Count - 2
WITH FrmLilo.TabStrip1
.Index = i
@@ -104,17 +107,44 @@
ELSE
sCliSection = ""
END IF
+
+
+
sFile = sFile & gb.NewLine & sSection & gb.NewLine &
gb.NewLine & sCliSection & gb.NewLine
END IF
END IF
+
NEXT
'Message(FrmLilo.TabStrip1.text)
+ IF InStr(.text, "Windows") THEN
+ FOR EACH cb IN MdlLiloOsList.arrWinInstalls
+ IF cb.value = TRUE THEN
+ FOR EACH tb IN MdlLiloOsList.arrWinLabels
+ IF tb.tag = cb.tag THEN
+ sWinSection = "other = " & tb.Tag & gb.NewLine &
+ "label = " & tb.Text & gb.NewLine &
+ "table = " & tb.Tag & gb.NewLine
+ ELSE
+ sSection = ""
+ END IF
+ NEXT
+ END IF
+ sFile = sFile & gb.NewLine & sWinSection & gb.NewLine
+NEXT
+END IF
+
+
END WITH
NEXT
'sFile = sFile & gb.NewLine & sSection & gb.NewLine & gb.NewLine &
sCliSection & gb.NewLine
+
+
+
+
+
Message(sfile)
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Aug 14 07:40:27 2008
@@ -24,6 +24,8 @@
PUBLIC cbWins AS Object[]
PUBLIC bVlCliOption AS Boolean
PUBLIC bIncluded AS Object[]
+PUBLIC arrWinInstalls AS Object[]
+PUBLIC arrWinLabels AS Object[]
PUBLIC SUB LIST_WIN_INSTALL_CHOICES(iCurrentTabCnt AS Integer)
DIM sFatList AS String
@@ -43,7 +45,8 @@
' But I guess listing partitions will do for now
-
+ arrWinInstalls = NEW Object[]
+ arrWinLabels = NEW Object[]
SHELL "fdisk -l | grep -E \'^/dev/.* \\* .*(FAT16)\' | cut -f 1 -d \'
\'" TO sFatList
sFatList = Trim(sFatList)
IF sFatList <> "" THEN
@@ -59,9 +62,10 @@
' now populate it with the necessary stuff
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinBanner"
WITH tl
- .text = "Operating system found in " & sWinPart
- .Move(4, 12, MdlObjSizer.get_object_width(.text)
+ 24, 27)
+ .text = "<b>Windows installation found in " &
sWinPart & "</b>"
+ .Move(4, 16, MdlObjSizer.get_object_width(.text)
+ 24, 27)
.Alignment = Align.Normal
+ .BackColor = Color.Background
END WITH
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinName"
@@ -69,6 +73,7 @@
.text = "Name "
.Move(tl.left, tl.top + tl.height + 8,
MdlObjSizer.get_object_width(.text) + 8, 27)
.Alignment = Align.Normal
+ .BackColor = Color.Background
END WITH
tb = NEW TextBox(FrmLilo.TabStrip1) AS "WinNameBox"
@@ -78,6 +83,7 @@
.Height = 27
.Width = MdlObjSizer.get_object_width(.text) * 2
.Move(tl.left + tl.Width + 8, tl.top)
+ .BackColor = Color.Background
END WITH
@@ -86,7 +92,11 @@
.text = "Include this Operating System in the
boot menu"
.Move(tl.left, tl.top + tl.height,
MdlObjSizer.get_object_width(.text) + 36, 27)
.Value = TRUE
+ .BackColor = Color.Background
+ .tag = sWinPart
END WITH
+ arrWinInstalls.Add(cb) ' add to the array to find
out wether to include or not in the boot menu
+
END WITH ' end jacking with the tabstrip
NEXT
END IF
@@ -102,8 +112,11 @@
FOR i = 0 TO arrNTFS.count - 1
idx = FrmLilo.TabStrip1.count - 1
+ sWinPart = arrNTFS[i]
+ sWinAddr = Right(arrNTFS[i], Len(arrNTFS[i]) -
RInStr(arrNTFS[i], "/"))
SHELL "mkdir /mnt" &/ sWinAddr WAIT
- SHELL "mount " & sWinPart & Space(1) & "/mnt" &/ sWinAddr WAIT
+ PRINT "mounting " & sWinAddr
+ SHELL "mount " & "/dev" &/ sWinAddr & Space(1) & "/mnt" &/
sWinAddr WAIT
IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"
&/ "winver.exe") = TRUE THEN
' this is indeed a windows installation
@@ -114,22 +127,42 @@
' Populate the new windows tab with just one
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinPartLbl"
WITH tl
- .Move(4, 8)
- .text = "Windows installation found in " &
sWinPart
+ .Move(4, 24)
+ .text = "<b>Windows installation found in " &
sWinPart & "</b>"
.Height = 27
.Width = MdlObjSizer.get_object_width(.text)
.BackColor = Color.Background
END WITH
- cb = NEW CheckBox(FrmLilo.TabStrip1)
+ cb = NEW CheckBox(FrmLilo.TabStrip1)
AS "bIncludeThisWin"
WITH cb
.Move(4, tl.top + tl.Height + 12)
.tag = sWinPart
.text = "Include this installation in the boot
menu"
.Width = MdlObjSizer.get_object_width(.text) + 36
.Height = 24
+ .BackColor = Color.Background
.Value = TRUE
END WITH
+ arrWinInstalls.Add(cb) ' add to the array
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinLblLbl"
+ WITH tl
+ .text = "Label"
+ .MOVE(4, cb.top + cb.Height + 4,
MdlObjSizer.get_object_width(.text), 27)
+ .BackColor = Color.Background
+ .Alignment = Align.Normal
+ END WITH
+ tb = NEW TextBox(FrmLilo.TabStrip1) AS "WinLbl"
+ WITH tb
+ .text = "Windows-" & sWinAddr
+ .Move(tl.left + tl.Width + 4, tl.top, 200, 27)
+ .MaxLength = 15
+ .tag = sWinPart
+ END WITH
+ arrWinLabels.Add(tb)
+
+
+
END WITH
END IF
' now, unmount the partition
@@ -140,6 +173,23 @@
END IF
END
+
+
+PUBLIC SUB bIncludeThisWin_click()
+ DIM tb AS TextBox
+ IF LAST.value = TRUE THEN
+ FOR EACH tb IN arrWinLabels
+ IF tb.tag = LAST.tag THEN tb.Enabled = TRUE
+ NEXT
+ ELSE IF LAST.value = FALSE THEN
+ FOR EACH tb IN arrWinLabels
+ IF tb.tag = LAST.tag THEN tb.Enabled = FALSE
+ NEXT
+ END IF
+ 'PRINT LAST.tag
+
+END
+
|
|
From: <cod...@go...> - 2008-08-13 22:04:28
|
Author: M0...@gm...
Date: Wed Aug 13 15:03:42 2008
New Revision: 120
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/MdlInstallSys.module
Log:
- Attempt to fix the problem where fstab was printing "do not format" as
the partition type on some partitions.
this is done by cycling trhough the partitions and detecting each
partitions format using fdisk
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/.project
+# /home/moises/area-51/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsGlobal.class
+# /home/moises/area-51/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsPartSel.class
+# /home/moises/area-51/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsWinDrives.class
+# /home/moises/area-51/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmDiskPart.class
+# /home/moises/area-51/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmLicense.class
+# /home/moises/area-51/projects/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartScheme.class
+# /home/moises/area-51/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartSel.class
+# /home/moises/area-51/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPkgSel.class
+# /home/moises/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSelISO.class
+# /home/moises/area-51/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSummary.class
+# /home/moises/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmWinDrives.class
+# /home/moises/area-51/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlCore.module
+# /home/moises/area-51/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlDiskPart.module
+# /home/moises/area-51/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlObjSizer.module
+# /home/moises/area-51/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPartSel.module
+# /home/moises/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPkgSel.module
+# /home/moises/area-51/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSetup.module
+# /home/moises/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSummarize.module
+# /home/moises/area-51/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Aug 13 15:03:42 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlWinDrives.module
+# /home/moises/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Wed Aug 13 15:03:42 2008
@@ -82,10 +82,53 @@
DIM sPartition AS String
DIM sMountPoint AS String
DIM sMntOpts AS String
- DIM i AS Integer
+ DIM i, ii AS Integer
DIM sWinPart AS String
DIM sWinMntPnt AS String
DIM sFstab AS String
+ DIM sPartFmt AS String
+
+
+
+
+
+
+
+ ' MAKE SURE THE PARTITIONS TYPES ARE DETECTED CORRECTLY
+
+ IF ClsPartSel.fRoot LIKE "do not format" THEN
+ SHELL "part=$(parted " & Left(ClsPartSel.sRoot, Len(ClsPartSel.sRoot)
- 1) & " print | grep &\' " & Right(ClsPartSel.sroot) & "\' ; echo $part |
cut -f 6 -d \' \'" TO sPartFmt
+ sPartFmt = Trim(sPartFmt)
+ ClsPartSel.fRoot = sPartFmt
+ END IF
+ IF ClsPartSel.sHome AND ClsPartSel.fhome LIKE "do not format" THEN
+ SHELL "part=$(parted " & Left(ClsPartSel.sHome, Len(ClsPartSel.sHome)
- 1) & " print | grep &\' " & Right(ClsPartSel.sHome) & "\' ; echo $part |
cut -f 6 -d \' \'" TO sPartFmt
+ sPartFmt = Trim(sPartFmt)
+ ClsPartSel.fhome = sPartFmt
+ END IF
+ IF ClsPartSel.fUsr AND ClsPartSel.fUsr LIKE "do not format" THEN
+ SHELL "part=$(parted " & Left(ClsPartSel.sUsr, Len(ClsPartSel.sUsr) -
1) & " print | grep &\' " & Right(ClsPartSel.sUsr) & "\' ; echo $part | cut
-f 6 -d \' \'" TO sPartFmt
+ sPartFmt = Trim(sPartFmt)
+ ClsPartSel.fUsr = sPartFmt
+ END IF
+ IF ClsPartSel.fVar AND ClsPartSel.fVar LIKE "do not format" THEN
+ SHELL "part=$(parted " & Left(ClsPartSel.sVar, Len(ClsPartSel.sVar) -
1) & " print | grep &\' " & Right(ClsPartSel.sVar) & "\' ; echo $part | cut
-f 6 -d \' \'" TO sPartFmt
+ sPartFmt = Trim(sPartFmt)
+ ClsPartSel.fVar = sPartFmt
+ END IF
+ IF ClsPartSel.fOpt AND ClsPartSel.fOpt LIKE "do not format" THEN
+ SHELL "part=$(parted " & Left(ClsPartSel.sOpt, Len(ClsPartSel.sOpt) -
1) & " print | grep &\' " & Right(ClsPartSel.sOpt) & "\' ; echo $part | cut
-f 6 -d \' \'" TO sPartFmt
+ sPartFmt = Trim(sPartFmt)
+ ClsPartSel.fOpt = sPartFmt
+ END IF
+ IF ClsPartSel.fTmp AND ClsPartSel.fTmp LIKE "do not format" THEN
+ SHELL "part=$(parted " & Left(ClsPartSel.sTmp, Len(ClsPartSel.sTmp) -
1) & " print | grep &\' " & Right(ClsPartSel.sTmp) & "\' ; echo $part | cut
-f 6 -d \' \'" TO sPartFmt
+ sPartFmt = Trim(sPartFmt)
+ ClsPartSel.fTmp = sPartFmt
+
+ END IF
+
+
' make the changes show up on the steps now
FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"
@@ -105,8 +148,11 @@
"#not be checked(such AS MS - initrd / mnt OR NFS file systems)a 0.\n\n\n"
&
"#The Linux partitions\n"
+
+
sFstab = sFstab & gb.NewLine &
ClsPartSel.sRoot & " / " & LCase(ClsPartSel.fRoot) & " " &
ME.fS_oPTIONS(LCase(ClsPartSel.fRoot)) & " 0 1" & gb.NewLine
+
IF ClsPartSel.sHome THEN
sFstab = sFstab & gb.NewLine & ClsPartSel.sHome & " /home " &
LCase(ClsPartSel.fhome) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fhome)) & "
0 2"
END IF
|
|
From: Jose J. R. <jo...@gm...> - 2008-08-13 20:46:26
|
On 8/13/08, M0E Lnx <m0...@gm...> wrote: > I dont think it can use any of those plugins.... > > I thought the notifications were done via GTK > Notifications are done through the libnotify engine, but AFAIK a Desktop-specific plugin is needed to actually show them. > > On Wed, Aug 13, 2008 at 3:30 PM, Jose J. Rodriguez <jo...@gm...> > wrote: >> On 8/13/08, M0E Lnx <m0...@gm...> wrote: >>> >>> Notifications should work in LXDE too I assume. >>> >> >> Don't know. Is there a notification plugin for LXDE, or can it use the >> gnome notification plugin perhaps? >> >>> >>> On Wed, Aug 13, 2008 at 3:20 PM, Jose J. Rodriguez <jo...@gm...> >>> wrote: >>>> Notice that to get the nice vl-hot_umount notification popup on XFCE, >>>> you need to install libnotify, notification-daemon-xfce and libsexy. >>>> Still need to work on the KDE notifications, as they use a different >>>> engine. >>>> >>>> Regards, >>>> Joe1962 >> |
|
From: M0E L. <m0...@gm...> - 2008-08-13 20:36:55
|
I dont think it can use any of those plugins.... I thought the notifications were done via GTK On Wed, Aug 13, 2008 at 3:30 PM, Jose J. Rodriguez <jo...@gm...> wrote: > On 8/13/08, M0E Lnx <m0...@gm...> wrote: >> I really want to test this on my vl-light installs (on my older boxes) >> but for some reason vhalswitch is not included in vl-light. >> Can one of you guys send me your /sbin/vhalswitch? >> > > Can't remember if this list allows attachments and it is a short code, so: > > #!/bin/bash > > vdir=`dirname $0` > . $vdir/vasm-functions > check_root > > #if [ $DISPLAY ]; then > # DIALOG=Xdialog > #else > # DIALOG=dialog > #fi > $DCMD --backtitle "$BACKTITLE" --title "HAL Or VL-HOT?" --menu \ > "Would you like to use VL-Hot or HAL to manage your removable devices? \n > VL-Hot uses the kernel and udev to mount removable devices when they > are attached, > and HAL uses a polling daemon that continually scans the system for > recently attached hardware.\n > We recommend VL-Hot for older hardware. \n > Choose the system you would like to use, and we will disable the > other." 20 71 4\ > "VL-HOT" "udev-based external block device automounting system" \ > "HAL" "a daemon that implements hardware abstraction layer" \ > 2> $freply > result=$? > if [ $result != 0 ];then > exit 0 > fi > DRIVER="`cat $freply`" > #echo $DRIVER > case "$DRIVER" in > "VL-HOT") > #while [ ! "$(ps -ef|grep hal|wc|cut -d " " -f7)" = 1 ];do sh > /etc/rc.d/rc.hald stop; sleep 1;done > sh /etc/rc.d/rc.hald stop &>/dev/null > #sh /etc/rc.d/rc.messagebus stop &>/dev/null > chmod -x /etc/rc.d/rc.hald > #chmod -x /etc/rc.d/rc.messagebus > mv /etc/udev/rules.d/10-vl-hot.rules.disabled > /etc/udev/rules.d/10-vl-hot.rules &>/dev/null > exit 0 > ;; > "HAL") > chmod +x /etc/rc.d/rc.hald > #chmod +x /etc/rc.d/rc.messagebus > /etc/rc.d/rc.hald start &>/dev/null > #/etc/rc.d/rc.messagebus start &>/dev/null > mv /etc/udev/rules.d/10-vl-hot.rules > /etc/udev/rules.d/10-vl-hot.rules.disabled &>/dev/null > exit 0 > ;; > esac > > >> >> Notifications should work in LXDE too I assume. >> > > Don't know. Is there a notification plugin for LXDE, or can it use the > gnome notification plugin perhaps? > >> >> BTW Joe, I just signed up at berlios. >> Seems quite fast here too... I may end up moving my projects there >> (especially since google code is in read-only more again) >> > > Yes, I got your email from Berlios... :) > >> >> On Wed, Aug 13, 2008 at 3:20 PM, Jose J. Rodriguez <jo...@gm...> >> wrote: >>> Notice that to get the nice vl-hot_umount notification popup on XFCE, >>> you need to install libnotify, notification-daemon-xfce and libsexy. >>> Still need to work on the KDE notifications, as they use a different >>> engine. >>> >>> Regards, >>> Joe1962 > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Vectorlinux-devel mailing list > Vec...@li... > https://lists.sourceforge.net/lists/listinfo/vectorlinux-devel > |
|
From: <cod...@go...> - 2008-08-13 20:33:30
|
Author: M0...@gm...
Date: Wed Aug 13 13:33:24 2008
New Revision: 119
Modified:
branches/iVL/MdlLiloOsList.module
Log:
- Added code to detect windows installation
Rather than listing every FAT*|NTFS partition as a windows install, the
installer will try to mount
the partition and find \windows\system32\winver.exe in it. If this
executable is not found, then the
installer will assume this is not a windows install. Also... if the
partition cannot be mounted the
installer will not list it as a windows install. _HELP ME HERE !
- Populated windows tabs with a label containing the installation's address
and a checkbox to
include / exclude this partition from the boot menu
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Wed Aug 13 13:33:24 2008
@@ -96,20 +96,49 @@
IF sNTFSLst <> "" THEN
arrNTFS = Split(sNTFSLst, "\n")
iTotalEntries = iTotalEntries + (arrNTFS.Count - 1)
- END IF
+ 'ELSE
+ 'END IF
FOR i = 0 TO arrNTFS.count - 1
idx = FrmLilo.TabStrip1.count - 1
-
- WITH FrmLilo.TabStrip1
- .count = .count + 1
- .index = idx
- .text = "Windows"
- END WITH
+ SHELL "mkdir /mnt" &/ sWinAddr WAIT
+ SHELL "mount " & sWinPart & Space(1) & "/mnt" &/ sWinAddr WAIT
+ IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"
&/ "winver.exe") = TRUE THEN
+ ' this is indeed a windows installation
+
+ WITH FrmLilo.TabStrip1
+ .count = .count + 1
+ .index = idx
+ .text = "Windows-" & sWinAddr
+ ' Populate the new windows tab with just one
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinPartLbl"
+ WITH tl
+ .Move(4, 8)
+ .text = "Windows installation found in " &
sWinPart
+ .Height = 27
+ .Width = MdlObjSizer.get_object_width(.text)
+ .BackColor = Color.Background
+ END WITH
+
+ cb = NEW CheckBox(FrmLilo.TabStrip1)
+ WITH cb
+ .Move(4, tl.top + tl.Height + 12)
+ .tag = sWinPart
+ .text = "Include this installation in the boot
menu"
+ .Width = MdlObjSizer.get_object_width(.text) + 36
+ .Height = 24
+ .Value = TRUE
+ END WITH
+ END WITH
+ END IF
+ ' now, unmount the partition
+ SHELL "umount /mnt" &/ sWinAddr WAIT
+ ' I guess it's ok to leave the dir in there, since all of this
will dissapear after the insallation is done
+
NEXT
-
+ END IF
END
@@ -249,7 +278,7 @@
' Add an option to boot the recently installed OS to CLI mode
- ClsPartSel.sRoot = "/dev/hda6" ' for testing only
+ ClsPartSel.sRoot = "/dev/hda1" ' for testing only
IF sLiloDesc LIKE "Vector" THEN
IF arrLinux[i] = ClsPartSel.sRoot THEN
cbInclude = NEW CheckBox(FrmLilo.TabStrip1)
AS "VlCliOption"
@@ -293,7 +322,7 @@
PUBLIC SUB VlCliOption_click()
bVlCliOption = LAST.value
- PRINT bVlCliOption
+ 'PRINT bVlCliOption
END
|
|
From: Jose J. R. <jo...@gm...> - 2008-08-13 20:30:50
|
On 8/13/08, M0E Lnx <m0...@gm...> wrote:
> I really want to test this on my vl-light installs (on my older boxes)
> but for some reason vhalswitch is not included in vl-light.
> Can one of you guys send me your /sbin/vhalswitch?
>
Can't remember if this list allows attachments and it is a short code, so:
#!/bin/bash
vdir=`dirname $0`
. $vdir/vasm-functions
check_root
#if [ $DISPLAY ]; then
# DIALOG=Xdialog
#else
# DIALOG=dialog
#fi
$DCMD --backtitle "$BACKTITLE" --title "HAL Or VL-HOT?" --menu \
"Would you like to use VL-Hot or HAL to manage your removable devices? \n
VL-Hot uses the kernel and udev to mount removable devices when they
are attached,
and HAL uses a polling daemon that continually scans the system for
recently attached hardware.\n
We recommend VL-Hot for older hardware. \n
Choose the system you would like to use, and we will disable the
other." 20 71 4\
"VL-HOT" "udev-based external block device automounting system" \
"HAL" "a daemon that implements hardware abstraction layer" \
2> $freply
result=$?
if [ $result != 0 ];then
exit 0
fi
DRIVER="`cat $freply`"
#echo $DRIVER
case "$DRIVER" in
"VL-HOT")
#while [ ! "$(ps -ef|grep hal|wc|cut -d " " -f7)" = 1 ];do sh
/etc/rc.d/rc.hald stop; sleep 1;done
sh /etc/rc.d/rc.hald stop &>/dev/null
#sh /etc/rc.d/rc.messagebus stop &>/dev/null
chmod -x /etc/rc.d/rc.hald
#chmod -x /etc/rc.d/rc.messagebus
mv /etc/udev/rules.d/10-vl-hot.rules.disabled
/etc/udev/rules.d/10-vl-hot.rules &>/dev/null
exit 0
;;
"HAL")
chmod +x /etc/rc.d/rc.hald
#chmod +x /etc/rc.d/rc.messagebus
/etc/rc.d/rc.hald start &>/dev/null
#/etc/rc.d/rc.messagebus start &>/dev/null
mv /etc/udev/rules.d/10-vl-hot.rules
/etc/udev/rules.d/10-vl-hot.rules.disabled &>/dev/null
exit 0
;;
esac
>
> Notifications should work in LXDE too I assume.
>
Don't know. Is there a notification plugin for LXDE, or can it use the
gnome notification plugin perhaps?
>
> BTW Joe, I just signed up at berlios.
> Seems quite fast here too... I may end up moving my projects there
> (especially since google code is in read-only more again)
>
Yes, I got your email from Berlios... :)
>
> On Wed, Aug 13, 2008 at 3:20 PM, Jose J. Rodriguez <jo...@gm...>
> wrote:
>> Notice that to get the nice vl-hot_umount notification popup on XFCE,
>> you need to install libnotify, notification-daemon-xfce and libsexy.
>> Still need to work on the KDE notifications, as they use a different
>> engine.
>>
>> Regards,
>> Joe1962
|
|
From: M0E L. <m0...@gm...> - 2008-08-13 20:25:04
|
I really want to test this on my vl-light installs (on my older boxes) but for some reason vhalswitch is not included in vl-light. Can one of you guys send me your /sbin/vhalswitch? Notifications should work in LXDE too I assume. BTW Joe, I just signed up at berlios. Seems quite fast here too... I may end up moving my projects there (especially since google code is in read-only more again) On Wed, Aug 13, 2008 at 3:20 PM, Jose J. Rodriguez <jo...@gm...> wrote: > Notice that to get the nice vl-hot_umount notification popup on XFCE, > you need to install libnotify, notification-daemon-xfce and libsexy. > Still need to work on the KDE notifications, as they use a different > engine. > > Regards, > Joe1962 > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Vectorlinux-devel mailing list > Vec...@li... > https://lists.sourceforge.net/lists/listinfo/vectorlinux-devel > |
|
From: Jose J. R. <jo...@gm...> - 2008-08-13 20:20:28
|
Notice that to get the nice vl-hot_umount notification popup on XFCE, you need to install libnotify, notification-daemon-xfce and libsexy. Still need to work on the KDE notifications, as they use a different engine. Regards, Joe1962 |
|
From: Jose J. R. <jo...@gm...> - 2008-08-13 20:09:49
|
Ooops, forgot the link: http://hyperupload.com/download/022fd59c43/vl-hot-1.9.9-noarch-1vl59.tlz.html On 8/13/08, Jose J. Rodriguez <jo...@gm...> wrote: > Ok, here is a package of vl-hot-1.9.9 (2.0 beta). I've done a lot of > testing with 2 pendrives, but this is still a beta until others can > test it too. I will do some more testing with an external HDD with > multiple partitions tonight. > > Mount point naming has 3 levels of priority: > 1- from /etc/udev/vl-hot_names.conf, if the serial matches a definition > 2- from the partition label, if any > 3- if none of the above, the default name is "vl-hot" (this might change) > > If a second drive/partition has the same name, vl-hot_mount adds > consecutive numbers to the mount point. > > NOTE: due to what I explained before, there is no vl-hot-config in > this package, you need to edit /etc/udev/vl-hot.conf manually. > > Regards, > Joe1962 > |
|
From: Jose J. R. <jo...@gm...> - 2008-08-13 20:08:39
|
Ok, here is a package of vl-hot-1.9.9 (2.0 beta). I've done a lot of testing with 2 pendrives, but this is still a beta until others can test it too. I will do some more testing with an external HDD with multiple partitions tonight. Mount point naming has 3 levels of priority: 1- from /etc/udev/vl-hot_names.conf, if the serial matches a definition 2- from the partition label, if any 3- if none of the above, the default name is "vl-hot" (this might change) If a second drive/partition has the same name, vl-hot_mount adds consecutive numbers to the mount point. NOTE: due to what I explained before, there is no vl-hot-config in this package, you need to edit /etc/udev/vl-hot.conf manually. Regards, Joe1962 |
|
From: M0E L. <m0...@gm...> - 2008-08-13 19:29:53
|
yeah.. I noticed that... also google is finding a lot of bash, not gambas code SF is rather slow here too, that's why I never did upload any code there... I have http://vpackager.sourceforge.net but it just re-directs to googlecode because it's simple unbearably slow at times here. Hope you dont have to re-write all that stuff all over On Wed, Aug 13, 2008 at 2:21 PM, Jose J. Rodriguez <jo...@gm...> wrote: > On 8/13/08, M0E Lnx <m0...@gm...> wrote: >> I wonder how that happaned... >> I'm using googlecode to host all my projects, if unsafe, then maybe I >> should consider moving to sf or something >> > > I set up a new project on Berlios a couple of months ago, when I > started having trouble accesing googlecode, but I haven't uploaded any > code yet, while trying to fing the vl-hot-config source. Berlios works > pretty fast for me here and I believe they have a long and stable > history hosting open source projects. I didn't try SourceForge as it > is way to slow from here. > > http://developer.berlios.de/projects/vl-hot/ > >> >> Unfortunately, I can't locate the source anywhere >> >> google does find some modules and calsses in jjrweb though ... does >> that help at all? >> > > All the stuff on my website (jjrweb) is old, you can see the pages > mention that the projects continue on googlecode. > >> >> On Wed, Aug 13, 2008 at 1:42 PM, Jose J. Rodriguez <jo...@gm...> >> wrote: >>> A while back, I lost my working copy of vl-hot 1.0.4 and the backups >>> were corrupted. No problem I thought, I'll checkout from the svn. But >>> I have not been able to access googlecode for quite some time now, so >>> I sshed into uel s box and tried from there. Well, it turns out that >>> the googlecode svn of vl-hot has somehow been reset to a blank repo, >>> grrr.... >>> >>> I had already recovered the bash part of vl-hot from the distro, of >>> course, and this was the base for developing the new 2.0 version. I >>> was less fortunate with vl-hot-config, which is compiled gambas code, >>> I only have a much older version available, but there were a lot of >>> changes towards 1.0.4. >>> >>> So: does anybody have the source code for vl-hot-config 1.0.4? If so, >>> please send it to me, as vl-hot 2.0 is pretty much done and ready for >>> testing, but it needs a matching vl-hot-config, of course. >>> >>> Regards, >>> Joe1962 >>> > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Vectorlinux-devel mailing list > Vec...@li... > https://lists.sourceforge.net/lists/listinfo/vectorlinux-devel > |
|
From: Jose J. R. <jo...@gm...> - 2008-08-13 19:21:22
|
On 8/13/08, M0E Lnx <m0...@gm...> wrote: > I wonder how that happaned... > I'm using googlecode to host all my projects, if unsafe, then maybe I > should consider moving to sf or something > I set up a new project on Berlios a couple of months ago, when I started having trouble accesing googlecode, but I haven't uploaded any code yet, while trying to fing the vl-hot-config source. Berlios works pretty fast for me here and I believe they have a long and stable history hosting open source projects. I didn't try SourceForge as it is way to slow from here. http://developer.berlios.de/projects/vl-hot/ > > Unfortunately, I can't locate the source anywhere > > google does find some modules and calsses in jjrweb though ... does > that help at all? > All the stuff on my website (jjrweb) is old, you can see the pages mention that the projects continue on googlecode. > > On Wed, Aug 13, 2008 at 1:42 PM, Jose J. Rodriguez <jo...@gm...> > wrote: >> A while back, I lost my working copy of vl-hot 1.0.4 and the backups >> were corrupted. No problem I thought, I'll checkout from the svn. But >> I have not been able to access googlecode for quite some time now, so >> I sshed into uel s box and tried from there. Well, it turns out that >> the googlecode svn of vl-hot has somehow been reset to a blank repo, >> grrr.... >> >> I had already recovered the bash part of vl-hot from the distro, of >> course, and this was the base for developing the new 2.0 version. I >> was less fortunate with vl-hot-config, which is compiled gambas code, >> I only have a much older version available, but there were a lot of >> changes towards 1.0.4. >> >> So: does anybody have the source code for vl-hot-config 1.0.4? If so, >> please send it to me, as vl-hot 2.0 is pretty much done and ready for >> testing, but it needs a matching vl-hot-config, of course. >> >> Regards, >> Joe1962 >> |
|
From: M0E L. <m0...@gm...> - 2008-08-13 19:01:19
|
I wonder how that happaned... I'm using googlecode to host all my projects, if unsafe, then maybe I should consider moving to sf or something Unfortunately, I can't locate the source anywhere google does find some modules and calsses in jjrweb though ... does that help at all? On Wed, Aug 13, 2008 at 1:42 PM, Jose J. Rodriguez <jo...@gm...> wrote: > A while back, I lost my working copy of vl-hot 1.0.4 and the backups > were corrupted. No problem I thought, I'll checkout from the svn. But > I have not been able to access googlecode for quite some time now, so > I sshed into uel s box and tried from there. Well, it turns out that > the googlecode svn of vl-hot has somehow been reset to a blank repo, > grrr.... > > I had already recovered the bash part of vl-hot from the distro, of > course, and this was the base for developing the new 2.0 version. I > was less fortunate with vl-hot-config, which is compiled gambas code, > I only have a much older version available, but there were a lot of > changes towards 1.0.4. > > So: does anybody have the source code for vl-hot-config 1.0.4? If so, > please send it to me, as vl-hot 2.0 is pretty much done and ready for > testing, but it needs a matching vl-hot-config, of course. > > Regards, > Joe1962 > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Vectorlinux-devel mailing list > Vec...@li... > https://lists.sourceforge.net/lists/listinfo/vectorlinux-devel > |
|
From: Jose J. R. <jo...@gm...> - 2008-08-13 18:41:56
|
A while back, I lost my working copy of vl-hot 1.0.4 and the backups were corrupted. No problem I thought, I'll checkout from the svn. But I have not been able to access googlecode for quite some time now, so I sshed into uel s box and tried from there. Well, it turns out that the googlecode svn of vl-hot has somehow been reset to a blank repo, grrr.... I had already recovered the bash part of vl-hot from the distro, of course, and this was the base for developing the new 2.0 version. I was less fortunate with vl-hot-config, which is compiled gambas code, I only have a much older version available, but there were a lot of changes towards 1.0.4. So: does anybody have the source code for vl-hot-config 1.0.4? If so, please send it to me, as vl-hot 2.0 is pretty much done and ready for testing, but it needs a matching vl-hot-config, of course. Regards, Joe1962 |
|
From: <cod...@go...> - 2008-08-13 13:08:37
|
Author: M0...@gm...
Date: Wed Aug 13 06:08:29 2008
New Revision: 118
Modified:
branches/iVL/MdlLiloOsList.module
Log:
Fixed indexing problem in the lilo tabstrip when adding windows partitions.
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Wed Aug 13 06:08:29 2008
@@ -37,6 +37,7 @@
DIM tb AS TextBox
DIM sWinPart AS String
DIM sWinAddr AS String
+ DIM idx AS Integer
' I'd like to verify that there is actually a windows isntall there...
rather than simply listing every partition
' But I guess listing partitions will do for now
@@ -99,10 +100,11 @@
FOR i = 0 TO arrNTFS.count - 1
+ idx = FrmLilo.TabStrip1.count - 1
WITH FrmLilo.TabStrip1
.count = .count + 1
- .index = .count
+ .index = idx
.text = "Windows"
END WITH
NEXT
|
|
From: <cod...@go...> - 2008-08-12 21:58:13
|
Author: M0...@gm...
Date: Tue Aug 12 14:57:08 2008
New Revision: 117
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FrmLilo.class
branches/iVL/MdlLiloOsList.module
branches/iVL/ToDo
Log:
- Fixed backcolor property on the virtual objects created in the LILO screen
- Corrected code to detect FAT32|NTFS partitions. Not yet listed in the tabs
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/vluser/area-51/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/vluser/area-51/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /home/vluser/area-51/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# /home/vluser/area-51/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/vluser/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/vluser/area-51/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/vluser/area-51/projects/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/vluser/area-51/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPkgSel.class
+# /home/vluser/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/area-51/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSummary.class
+# /home/vluser/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /home/vluser/area-51/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/vluser/area-51/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/area-51/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /home/vluser/area-51/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPkgSel.module
+# /home/vluser/area-51/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSummarize.module
+# /home/vluser/area-51/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /home/vluser/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Tue Aug 12 14:57:08 2008
@@ -29,6 +29,7 @@
ME.sVidMode = "Standard"
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
MdlLiloOsList.LIST_LILO_OS_CHOICES()
+MdlLiloOsList.LIST_WIN_INSTALL_CHOICES(ME.TabStrip1.Count)
ME.tlList.text = "The following Operating Systems have been detected on
this computer. Choose your desired option " &
"for each one of them by clicking on each tab. To proceed with the default
pre-set values, simply click \'" & FMain.btnext.text & "\'"
ME.tlList.Adjust
@@ -96,7 +97,7 @@
'.tlTimoutSec.Move(.sbTimer.left + .sbTimer.Width + 4, .sbTimer.top,
MdlObjSizer.get_object_width(.tlTimoutSec.text) + 8)
.tlList.Move(.tlTimeOUt.left, .tlTimeOUt.top + .tlTimeOUt.Height +
8, .tlBanner.Width)
'.tlList.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height +
12, .tlBanner.Width)
- .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height *
5.5)
+ .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.tlBanner.Height
* 6))
END WITH
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Tue Aug 12 14:57:08 2008
@@ -89,17 +89,23 @@
END WITH ' end jacking with the tabstrip
NEXT
END IF
- SHELL "fdisk -l| grep -E \'^/dev/.* \\* .*(FAT32|HPFS|NTFS|Win)\' | cut
-f 1 -d \' \'" TO sNTFSLst
+ SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT32|HPFS|NTFS|Win)\' | cut -f
1 -d \' \'" TO sNTFSLst
sNTFSLst = Trim(sNTFSLst)
+ 'Message(sNTFSLst)
IF sNTFSLst <> "" THEN
arrNTFS = Split(sNTFSLst, "\n")
iTotalEntries = iTotalEntries + (arrNTFS.Count - 1)
END IF
- IF iTotalEntries = 0 THEN
- RETURN ' no need to proceed if no windows installs were found
- END IF
-
+
+ FOR i = 0 TO arrNTFS.count - 1
+
+ WITH FrmLilo.TabStrip1
+ .count = .count + 1
+ .index = .count
+ .text = "Windows"
+ END WITH
+ NEXT
END
@@ -162,6 +168,7 @@
.Move(4, 16, MdlObjSizer.get_object_width(.text) + 4, 27)
'.BackColor = Color.SelectedBackground
.Alignment = Align.Normal
+ .Background = Color.Background
'.ForeColor = Color.SelectedForeground
END WITH
@@ -174,6 +181,7 @@
.Value = TRUE
.Move(4, tl.top + tl.Height + 4,
MdlObjSizer.get_object_width(.text) + 24)
.tag = arrLinux[i]
+ .Background = Color.Background
END WITH
ME.bIncluded.Add(cbInclude)
@@ -183,7 +191,7 @@
.Move(cbInclude.left, cbInclude.top + cbInclude.Height +
4, MdlObjSizer.get_object_width(.text))
.Height = 27
.Alignment = Align.Normal
- .BackColor = Color.Default
+ .Background = Color.Background
END WITH
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "NameBox"
WITH txtAppnd
@@ -204,6 +212,7 @@
.Move(txtAppnd.Left + txtAppnd.Width + 8, txtAppnd.top,
MdlObjSizer.get_object_width(.text))
.Height = 27
.Alignment = Align.Normal
+ .Background = Color.Background
END WITH
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "initrdBox"
@@ -220,6 +229,7 @@
.Move(4, txtAppnd.top + txtAppnd.Height + 4,
MdlObjSizer.get_object_width(.text))
.Height = 27
.Alignment = Align.Normal
+ .Background = Color.Background
ME.iAppendLeft = .x + .Width + 4
@@ -234,12 +244,10 @@
.tag = arrLinux[i]
txtAppends.Add(txtAppnd)
END WITH
-
-
-
+
' Add an option to boot the recently installed OS to CLI mode
- ClsPartSel.sRoot = "/dev/hda1" ' for testing only
+ ClsPartSel.sRoot = "/dev/hda6" ' for testing only
IF sLiloDesc LIKE "Vector" THEN
IF arrLinux[i] = ClsPartSel.sRoot THEN
cbInclude = NEW CheckBox(FrmLilo.TabStrip1)
AS "VlCliOption"
@@ -250,6 +258,7 @@
.Height = 27
.Move(4, tl.top + tl.Height + 12)
.tag = arrLinux[i]
+ .Background = Color.Background
END WITH
END IF
Modified: branches/iVL/ToDo
==============================================================================
--- branches/iVL/ToDo (original)
+++ branches/iVL/ToDo Tue Aug 12 14:57:08 2008
@@ -7,5 +7,5 @@
* Read the tabstrip to create the lilo.conf
* Store lilo.conf to /etc
* Run lilo.
+**** DO WE STILL NEED TO DETECT FAT16 PARTITIONS? WHO IS STILL RUNNING
DOS/WIN95/98?
-
\ No newline at end of file
|
|
From: <cod...@go...> - 2008-08-12 16:22:31
|
Author: M0...@gm...
Date: Tue Aug 12 09:22:09 2008
New Revision: 116
Modified:
branches/iVL/MdlConfLilo.module
Log:
- LILO config now creates a text boot option for the recently installed
vector entry.
- Fixed append line in cli boot option of lilo.conf prospect
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Aug 12 09:22:09 2008
@@ -98,15 +98,15 @@
IF sMatchTag = ClsPartSel.sRoot THEN
IF MdlLiloOsList.bVlCliOption = TRUE THEN
- sCliSection = Replace(sSection, "append = \""
& sEntryApnd & "\"", "append = \"2 splash=silent\"")
+ sCliSection = Replace(sSection, "append = \""
& sEntryApnd & "\"", "append = \"2 " & sEntryApnd & "\"") 'splash=silent\"")
sCliSection = Replace(sCliSection, "label = "
& sEntryLbl, "label = " & sEntryLbl & "-tui")
END IF
ELSE
sCliSection = ""
END IF
-
+ sFile = sFile & gb.NewLine & sSection & gb.NewLine &
gb.NewLine & sCliSection & gb.NewLine
END IF
- sFile = sFile & gb.NewLine & sSection & gb.NewLine & gb.NewLine
& sCliSection & gb.NewLine
+
END IF
NEXT
|
|
From: <cod...@go...> - 2008-08-12 15:44:05
|
Author: M0...@gm...
Date: Tue Aug 12 08:43:02 2008
New Revision: 115
Modified:
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLiloOsList.module
Log:
- LILO config now creates a text boot option for the recently installed
vector entry.
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Aug 12 08:43:02 2008
@@ -95,26 +95,27 @@
"read-only"
'Message(sSection)
-
- FOR EACH cb IN MdlLiloOsList.bVlCliOption
- IF cb.Tag = sMatchTag THEN
- IF cb.Value = TRUE THEN
- sCliSection = Replace(sSection, "append = \"" &
sEntryApnd & "\"", "append = \"2 splash=silent\"")
- sCliSection = Replace(sCliSection, "label = " &
sEntryLbl, label = sEntryLbl & "-tui")
+
+ IF sMatchTag = ClsPartSel.sRoot THEN
+ IF MdlLiloOsList.bVlCliOption = TRUE THEN
+ sCliSection = Replace(sSection, "append = \""
& sEntryApnd & "\"", "append = \"2 splash=silent\"")
+ sCliSection = Replace(sCliSection, "label = "
& sEntryLbl, "label = " & sEntryLbl & "-tui")
+ END IF
+ ELSE
+ sCliSection = ""
END IF
- END IF
- NEXT
-
-sFile = sFile & gb.NewLine & sSection & gb.NewLine
-
+
END IF
+ sFile = sFile & gb.NewLine & sSection & gb.NewLine & gb.NewLine
& sCliSection & gb.NewLine
END IF
-
+
NEXT
'Message(FrmLilo.TabStrip1.text)
END WITH
+
NEXT
-Message.Delete(sFile)
+'sFile = sFile & gb.NewLine & sSection & gb.NewLine & gb.NewLine &
sCliSection & gb.NewLine
+Message(sfile)
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Tue Aug 12 08:43:02 2008
@@ -239,7 +239,7 @@
' Add an option to boot the recently installed OS to CLI mode
- ClsPartSel.sRoot = "/dev/hda1"
+ ClsPartSel.sRoot = "/dev/hda1" ' for testing only
IF sLiloDesc LIKE "Vector" THEN
IF arrLinux[i] = ClsPartSel.sRoot THEN
cbInclude = NEW CheckBox(FrmLilo.TabStrip1)
AS "VlCliOption"
|
|
From: <cod...@go...> - 2008-08-11 22:02:50
|
Author: M0...@gm...
Date: Mon Aug 11 15:02:20 2008
New Revision: 114
Added:
branches/iVL/ToDo
Removed:
branches/iVL/Order
branches/iVL/install-pkg
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/FrmPkgsel2.class
branches/iVL/FrmPkgsel2.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlCore.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlPkgSel.module
Log:
- Made left panel wider (to avoid unnecessary scroll bar (due to rants in
the forum))
- Added descriptions to the CUSTOM install package selection window.
This will now display each package's description when the user moves the
mouse over it
- Added initrd label and textbox for initrd option on LILO config window
- Removed "feature" that updated the tab.text property in the lilo config
window. This is because
we will need a stable referral point so we can come back and mount these
partitions and then copy
their kernels/initrd's and popperly address them.
- Began gathering information from the LILO window to create
lilo.conf "sections"
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Aug 11 15:02:20 2008
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:271
+#: FMain.class:272
msgid "Process Overview"
msgstr ""
-#: FMain.class:290
+#: FMain.class:291
msgid "Next"
msgstr ""
-#: FMain.class:296
+#: FMain.class:297
msgid "Back"
msgstr ""
-#: FMain.class:302
+#: FMain.class:303
msgid "Exit"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Aug 11 15:02:20 2008
@@ -1,6 +1,6 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmLilo
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 11 15:02:20 2008
@@ -67,12 +67,13 @@
END WITH
'ME.TreeView1.BackColor = Color.Transparent
ME.AUTOSIZE_LEFT_PANE
-WITH FrmLilo
-.Reparent(Fmain.pnlWinHost)
-.Width = Fmain.pnlWinHost.Width
-.Height = Fmain.pnlWinHost.Height
-.Show
-END WITH
+' ' '
+' ' ' WITH FrmLilo
+' ' ' .Reparent(Fmain.pnlWinHost)
+' ' ' .Width = Fmain.pnlWinHost.Width
+' ' ' .Height = Fmain.pnlWinHost.Height
+' ' ' .Show
+' ' ' END WITH
END
@@ -83,7 +84,7 @@
ME.tvPlan.MoveFirst()
REPEAT
IF MdlObjSizer.get_object_width(tvPlan.Item.Text) > iWidth THEN
- iWidth = MdlObjSizer.get_object_width(tvPlan.item.Text)
+ iWidth = MdlObjSizer.get_object_width(tvPlan.item.Text) + 24
END IF
UNTIL ME.tvPlan.MoveBelow()
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Mon Aug 11 15:02:20 2008
@@ -37,14 +37,11 @@
ME.TabStrip1.Index = 0
-ME.Maximized = TRUE
+'ME.Maximized = TRUE
FBResolution_Click()
FBResolution.text = "Standard"
-END
-
-
-
+END
@@ -56,6 +53,7 @@
.LiloTarget.Enabled = FALSE
.FBResolution.Enabled = FALSE
.TabStrip1.Enabled = FALSE
+ .sbTimer.Enabled = FALSE
END WITH
ELSE
WITH ME
@@ -63,6 +61,7 @@
'.LiloAppendBox.Enabled = TRUE
.LiloTarget.Enabled = TRUE
.FBResolution.Enabled = TRUE
+ .sbTimer.Enabled = TRUE
END WITH
END IF
@@ -137,5 +136,11 @@
PUBLIC SUB tlBanner_MouseDown()
+
+END
+
+PUBLIC SUB Form_Menu()
+
+ MdlConfLilo.WRITE_LILO_DOT_CONF
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Mon Aug 11 15:02:20 2008
@@ -12,17 +12,17 @@
Text = ("Don't Install Lilo")
}
{ TabStrip1 TabStrip
- MoveScaled(1,38,61,28)
+ MoveScaled(2,27,61,28)
Index = 0
Text = ("Tab 0")
Index = 0
}
{ tlList TextLabel
- MoveScaled(1,26,57,6)
+ MoveScaled(1,19,57,6)
Text = ("TextLabel1")
}
{ LiloTarget ComboBox
- MoveScaled(13,9,31,3.125)
+ MoveScaled(13,9,19,3)
Text = ("")
ReadOnly = True
List = []
@@ -32,25 +32,26 @@
Text = ("Target")
}
{ tlFbMode TextLabel
- MoveScaled(1,14,18,3.125)
+ MoveScaled(33,9,18,3.125)
Text = ("Video Resolution")
}
{ FBResolution ComboBox
- MoveScaled(20,14,21,3.125)
+ MoveScaled(52,9,21,3.125)
Text = ("")
ReadOnly = True
List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
}
{ tlTimeOUt TextLabel
- MoveScaled(1,20,18,3.125)
+ MoveScaled(1,14,18,3.125)
Text = ("Prompt Timeout")
Alignment = Align.Normal
}
{ sbTimer SpinBox
- MoveScaled(20,20,9,3)
+ MoveScaled(20,14,9,3)
+ Value = 3
}
{ tlTimoutSec TextLabel
- MoveScaled(30,20,7,3.125)
+ MoveScaled(30,14,7,3.125)
Text = ("Seconds")
Alignment = Align.Normal
}
Modified: branches/iVL/FrmPkgsel2.class
==============================================================================
--- branches/iVL/FrmPkgsel2.class (original)
+++ branches/iVL/FrmPkgsel2.class Mon Aug 11 15:02:20 2008
@@ -22,7 +22,7 @@
.tlbanner.Adjust
'.tlbanner.Border = Border.Plain
'.tlbanner.Width = MdlObjSizer.get_object_width(.tlbanner.Text)
-
+ .Maximized = TRUE
END WITH
FMain.FrmCurr = ME
FMain.btback.Enabled = TRUE
@@ -30,13 +30,15 @@
FMain.tvPlan["Prep2"].Selected = TRUE
FMain.btback.ForeColor = Color.Black
MdlPkgSel.LIST_PACKAGE_SELECTION()
+
END
PUBLIC SUB Form_Resize()
WITH ME
.tlbanner.Width = .ClientWidth - 16
- .scrPkgs.Move(.tlbanner.Left, .tlbanner.top + (.tlbanner.Height *
1.5), .tlbanner.Width - 4, .ClientHeight - (.tlbanner.Height *
4)) ', .tlbanner.Width - 8, .ClientHeight - .tlbanner.height - 8)
+ .scrPkgs.Move(.tlbanner.Left, .tlbanner.top + (.tlbanner.Height +
8), .tlbanner.Width - 4, .ClientHeight - (.tlbanner.Height *
4.5)) ', .tlbanner.Width - 8, .ClientHeight - .tlbanner.height - 8)
+ .frmDesc.Move(.scrPkgs.Left, scrPkgs.top + scrPkgs.Height + 8,
scrPkgs.Width, .ClientH - (.tlbanner.Height + .scrPkgs.Height + 24))
END WITH
@@ -56,11 +58,7 @@
END
-PUBLIC SUB scrPkgs_MouseDown()
-
-
-END
PUBLIC SUB Form_Hide()
Modified: branches/iVL/FrmPkgsel2.form
==============================================================================
--- branches/iVL/FrmPkgsel2.form (original)
+++ branches/iVL/FrmPkgsel2.form Mon Aug 11 15:02:20 2008
@@ -8,7 +8,19 @@
Text = ("TextLabel1")
}
{ scrPkgs ScrollView
- MoveScaled(1,8,50,22)
+ MoveScaled(0,7,60,32)
Expand = True
+ }
+ { frmDesc Frame
+ MoveScaled(1,41,59,18)
+ Background = Color.LightBackground
+ Text = ("")
+ { tlPkgDesc TextLabel
+ MoveScaled(1,2,56,13)
+ Background = Color.LightBackground
+ Text = ("")
+ Alignment = Align.Left
+ Transparent = True
+ }
}
}
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Mon Aug 11 15:02:20 2008
@@ -51,7 +51,71 @@
PUBLIC SUB WRITE_LILO_DOT_CONF()
DIM sFile AS String
-DIM sEntryLbl, sEntryApnd, sEntryRoot, sEntryInitrd AS String
+DIM tb AS TextBox
+DIM sShortAddr AS String
+DIM sMatchTag AS String
+DIM bInc AS CheckBox
+DIM cb AS CheckBox
+DIM sEntryLbl, sEntryApnd, sEntryRoot, sEntryInitrd, sSection AS String
+DIM i AS Integer
+DIM sCliSection AS String
+ FOR i = 0 TO FrmLilo.TabStrip1.Count - 2
+ WITH FrmLilo.TabStrip1
+ .Index = i
+ sShortAddr = Right(.text, Len(.text) - InStr(.text, "-"))
+ sMatchTag = "/dev" &/ sShortAddr
+ FOR EACH bInc IN MdlLiloOsList.bIncluded
+ IF bInc.tag = sMatchTag THEN
+ IF bInc.value = TRUE THEN ' include this OS
+
+ ' collect the information about this one entry now
+ sEntryRoot = sMatchTag
+ FOR EACH tb IN MdlLiloOsList.txtNames
+ IF tb.tag = sMatchTag THEN
+ sEntryLbl = tb.Text
+ END IF
+ NEXT
+ FOR EACH tb IN MdlLiloOsList.txtInitrds
+ IF tb.tag = sMatchTag THEN
+ sEntryInitrd = tb.Text
+ END IF
+ NEXT
+ FOR EACH tb IN MdlLiloOsList.txtAppends
+ IF tb.tag = sMatchTag
+ sEntryApnd = tb.Text
+ END IF
+ NEXT
+
+ ' now put it all in one variable
+ sSection = "image = /boot/tamu/vmlinuz-" & sShortAddr
& gb.NewLine &
+ "root = " & sMatchTag & gb.NewLine &
+ "label = " & sEntryLbl & gb.NewLine &
+ "append = \"" & sEntryApnd & "\"" & gb.NewLine &
+ "initrd = " & sEntryInitrd & gb.NewLine &
+ "read-only"
+ 'Message(sSection)
+
+
+ FOR EACH cb IN MdlLiloOsList.bVlCliOption
+ IF cb.Tag = sMatchTag THEN
+ IF cb.Value = TRUE THEN
+ sCliSection = Replace(sSection, "append = \"" &
sEntryApnd & "\"", "append = \"2 splash=silent\"")
+ sCliSection = Replace(sCliSection, "label = " &
sEntryLbl, label = sEntryLbl & "-tui")
+ END IF
+ END IF
+ NEXT
+
+sFile = sFile & gb.NewLine & sSection & gb.NewLine
+
+ END IF
+ END IF
+
+ NEXT
+ 'Message(FrmLilo.TabStrip1.text)
+ END WITH
+ NEXT
+Message.Delete(sFile)
+
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Mon Aug 11 15:02:20 2008
@@ -212,7 +212,7 @@
FMain.tvPlan["Prep0"].Selected = TRUE
'Balloon("Scanning drives for media ... please wait", fmain.pnlWinHost)
-RETURN
+'RETURN
FrmSelISO.tlDistroDesc.Text = "<b>Scanning system for installable media.
Please wait ...</b>"
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Mon Aug 11 15:02:20 2008
@@ -19,9 +19,11 @@
PRIVATE sText AS String
PUBLIC txtAppends AS Object[]
PUBLIC txtNames AS Object[]
+PUBLIC txtInitrds AS Object[]
PUBLIC iAppendLeft AS Integer
PUBLIC cbWins AS Object[]
PUBLIC bVlCliOption AS Boolean
+PUBLIC bIncluded AS Object[]
PUBLIC SUB LIST_WIN_INSTALL_CHOICES(iCurrentTabCnt AS Integer)
DIM sFatList AS String
@@ -125,6 +127,8 @@
txtAppends = NEW Object[]
txtNames = NEW Object[]
+txtInitrds = NEW Object[]
+bIncluded = NEW Object[]
'FrmLilo.TabStrip1.Count = 1
cbarr = NEW Object[]
@@ -169,8 +173,9 @@
.Height = 27
.Value = TRUE
.Move(4, tl.top + tl.Height + 4,
MdlObjSizer.get_object_width(.text) + 24)
+ .tag = arrLinux[i]
END WITH
-
+ ME.bIncluded.Add(cbInclude)
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "Label"
WITH tl
@@ -192,33 +197,46 @@
END WITH
txtNames.Add(txtAppnd)
+
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "InitdLbl"
+ WITH tl
+ .text = "Initial Ram Disk"
+ .Move(txtAppnd.Left + txtAppnd.Width + 8, txtAppnd.top,
MdlObjSizer.get_object_width(.text))
+ .Height = 27
+ .Alignment = Align.Normal
+ END WITH
+
+ txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "initrdBox"
+ WITH txtAppnd
+ .text = "initrd-" & sShortAddr
+ .Move(tl.Left + tl.Width + 4, tl.top, 250, 27)
+ .tag = arrLinux[i]
+ END WITH
+ ME.txtInitrds.Add(txtAppnd)
+
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "AppndLbl"
WITH tl
.text = "Kernel boot options"
.Move(4, txtAppnd.top + txtAppnd.Height + 4,
MdlObjSizer.get_object_width(.text))
.Height = 27
.Alignment = Align.Normal
+
ME.iAppendLeft = .x + .Width + 4
+
END WITH
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
WITH txtAppnd
.Move(tl.Left + tl.Width + 8, tl.top,
FrmLilo.TabStrip1.Width - (tl.Width * 1.5))
- '.Width = FrmLilo.TabStrip1.Width - tl.Width - (tl.left *
4)
- ' IF FrmLilo.sVidMode <> "Standard" THEN
- ' .Enabled = TRUE
- ' .text = .text & " splash=silent"
- ' '.Width = FrmLilo.TabStrip1.Width - tl.Width - (tl.left
* 4)
- ' ELSE
- ' '.Enabled = FALSE
- ' '.Text = "not available in \'Standard\' Resolution
mode"
- ' .Text = .text & Replace(.text, "splash=silent", "")
- ' ' .Width = FrmLilo.TabStrip1.Width - tl.Width -
(tl.left * 2)
- ' END IF
+
.Height = 27
+ .tag = arrLinux[i]
txtAppends.Add(txtAppnd)
END WITH
+
+
+
' Add an option to boot the recently installed OS to CLI mode
ClsPartSel.sRoot = "/dev/hda1"
@@ -231,6 +249,7 @@
.Width = MdlObjSizer.get_object_width(.text) + 36
.Height = 27
.Move(4, tl.top + tl.Height + 12)
+ .tag = arrLinux[i]
END WITH
END IF
@@ -278,16 +297,6 @@
PUBLIC SUB NameBox_keyrelease()
- DIM tx AS TextBox
- FOR EACH tx IN txtNames
- IF tx.tag = LAST.tag THEN
- tx.text = Replace(LAST.text, " ", "")
- FrmLilo.TabStrip1.Current.text = LAST.text
- END IF
-
-
- NEXT
-
END
Modified: branches/iVL/MdlPkgSel.module
==============================================================================
--- branches/iVL/MdlPkgSel.module (original)
+++ branches/iVL/MdlPkgSel.module Mon Aug 11 15:02:20 2008
@@ -73,6 +73,7 @@
DIM i, y AS Integer
DIM sRawFile AS String[]
DIM sLine AS String
+
' THis one is kind of tricky.. it will read the whole PACKAGES.TXT
y = 4
@@ -97,7 +98,7 @@
.x = 4
.y = y
.Height = 27
- .Width = MdlObjSizer.get_object_width(.Text) * 2
+ .Width = MdlObjSizer.get_object_width(.Text) * 1.5
.Value = TRUE
END WITH
ME.Pkgs.Add(cb)
@@ -111,15 +112,58 @@
PUBLIC SUB Packages_click()
+
+
IF ClsPkgSel.arrPkgs THEN
ClsPkgSel.arrPkgs.Clear
END IF
ME.GET_USER_PKG_SELECTION()
-
+
+ ' Now display a description here
+
+
+ 'PRINT sDump
END
+PUBLIC SUB Packages_enter()
+
+DIM sSearch AS String
+DIM sDump AS String
+DIM sArr AS String[]
+DIM i AS Integer
+DIM sDesc AS String
+
+
+
+
+ sSearch = Right(LAST.tag, Len(LAST.tag) - InStr(LAST.tag, "/"))
+
+ ' IF InStr(sSearch, "-") = < 3 THEN
+
+ sSearch = Left(sSearch, InStr(sSearch, "-") - 1)
+
+
+ ' ELSE
+ 'sSearch = Left(sSearch, InStr(sSearch, "-") - InStr(sSearch, "-") -
1) ' this will not work
+ 'end if
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT |
grep -m 8 \'" & sSearch & ":\' | cut -f2- -d \':\'" TO sDump
+ sArr = Split(sDump, "\n")
+ FOR i = 0 TO sArr.count - 1
+ IF InStr(sArr[i], ":") = FALSE THEN
+ sDesc = sDesc & sArr[i]
+ END IF
+ NEXT
+
+ sDesc = Trim(sDesc)
+
+ FrmPkgsel2.tlPkgDesc.Text = sDesc
+
+
+END
+
+
@@ -129,6 +173,8 @@
ClsPkgSel.arrBulks.Clear
END IF
ME.GET_USER_BULK_SELECTION
+
+ PRINT LAST.tag
END
Added: branches/iVL/ToDo
==============================================================================
--- (empty file)
+++ branches/iVL/ToDo Mon Aug 11 15:02:20 2008
@@ -0,0 +1,11 @@
++ Lilo Config Window
+ * Find all other linuxes installed - DONE
+ * Create a lilo entry for each (each tab will make one one lilo entry)
- DONE
+ * Copy all kernels and initrds to /boot/tamu ??? -HELP ME!!!
+ + /boot/tamu/initrd-hda1
+ + /boot/tamu/vmlinux-hda1
+ * Read the tabstrip to create the lilo.conf
+ * Store lilo.conf to /etc
+ * Run lilo.
+
+
\ No newline at end of file
|
|
From: <cod...@go...> - 2008-08-08 19:25:00
|
Author: M0...@gm...
Date: Fri Aug 8 12:24:44 2008
New Revision: 113
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FMain.form
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlCore.module
branches/iVL/MdlDiskPart.module
branches/iVL/MdlLiloOsList.module
Log:
- Began working on adding windows installs to the lilo config options
- Repositioned objects in the LILO window to make them visible a smaller
resolutions.
- Found problem with append box on the tab strip (not fixed yet)
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Aug 8 12:24:44 2008
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:257
+#: FMain.class:271
msgid "Process Overview"
msgstr ""
-#: FMain.class:280
+#: FMain.class:290
msgid "Next"
msgstr ""
-#: FMain.class:286
+#: FMain.class:296
msgid "Back"
msgstr ""
-#: FMain.class:292
+#: FMain.class:302
msgid "Exit"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Aug 8 12:24:44 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 Fri Aug 8 12:24:44 2008
@@ -28,7 +28,8 @@
PUBLIC SUB Form_Open()
DIM iImg AS Image
-ME.Maximized = TRUE
+'ME.Maximized = TRUE
+
MdlCore.LOCK_GUI
'MdlCore.LOCK_GUI()
ClsGlobal.sBackNav = NEW Object[]
@@ -42,10 +43,16 @@
PictureBox1.Picture = iImg.Picture
PictureBox1.Background = Color.SelectedBackground
PictureBox1.Stretch = TRUE
-
+MdlCore.PREPARE_INSTALL_LAYOUT
FrmSelISO.Show
+'FrmSelISO.Hide
+
+
+'STOP EVENT
+ME.Width = 800
+ME.Height = 600
+
-MdlCore.PREPARE_INSTALL_LAYOUT
WITH ME
.btback.Enabled = FALSE
@@ -60,6 +67,12 @@
END WITH
'ME.TreeView1.BackColor = Color.Transparent
ME.AUTOSIZE_LEFT_PANE
+WITH FrmLilo
+.Reparent(Fmain.pnlWinHost)
+.Width = Fmain.pnlWinHost.Width
+.Height = Fmain.pnlWinHost.Height
+.Show
+END WITH
END
@@ -96,7 +109,7 @@
.btQuit.Width = MdlObjSizer.get_object_width(.btQuit.Text) + 36
END WITH
'ME.AUTOSIZE_LEFT_PANE
-
+'ME.pnlWinHost.Resize(ME.ClientWidth - ME.Frame1.Width - (ME.Frame1.left *
8), ME.ClientH - ME.tlBanner.Height - (ME.btback.Height * 8))
WITH ME
.tlBanner.width = ME.width
.Frame1.Move(4, .PictureBox1.Top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth * 1.5, .ClientHeight - .PictureBox1.Height * 1.5)
@@ -106,7 +119,7 @@
'.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
'.pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 3.5)))
- .pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.Top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlBanner.Height + (.btback.Height * 3.5)))
+ .pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.Top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlBanner.Height + (.btback.Height * 3)))
.btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width +
8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
@@ -117,6 +130,7 @@
.tlBanner.Height = .PictureBox1.Height
.tlBanner.top = .PictureBox1.Top
END WITH
+
END
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Fri Aug 8 12:24:44 2008
@@ -19,9 +19,6 @@
Text = ("")
Alignment = Align.Center
}
- { pnlWinHost VBox
- MoveScaled(28,9,66,56)
- }
{ btnext Button
MoveScaled(49,67,8,3)
Text = ("Next")
@@ -40,5 +37,11 @@
{ PictureBox1 PictureBox
MoveScaled(36,1,54,8)
Stretch = True
+ }
+ { pnlwinhost Panel
+ MoveScaled(27,10,56,41)
+ Expand = True
+ Arrangement = Arrange.Fill
+ Border = Border.Plain
}
}
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Fri Aug 8 12:24:44 2008
@@ -33,8 +33,21 @@
"for each one of them by clicking on each tab. To proceed with the default
pre-set values, simply click \'" & FMain.btnext.text & "\'"
ME.tlList.Adjust
ME.TabStrip1.Index = 0
+MdlLiloOsList.bVlCliOption = FALSE
+
+
+ME.TabStrip1.Index = 0
+ME.Maximized = TRUE
+FBResolution_Click()
+FBResolution.text = "Standard"
END
+
+
+
+
+
+
PUBLIC SUB YNLiloBox_Click()
IF ME.YNLiloBox.value = TRUE THEN
@@ -65,24 +78,31 @@
.tlBanner.Move(4, 4)
.tlBanner.Width = .ClientWidth - (.tlBanner.x * 2)
.YNLiloBox.Move(.tlBanner.left, .tlBanner.Top + (.tlBanner.Height +
1.5), MdlObjSizer.get_object_width(.YNLiloBox.text) + 36, 28)
- .tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height *
1.5), MdlObjSizer.get_object_width(.tlTarGet.Text) + 8)
- .LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width +
2, .tlTarGet.top, .tlBanner.Width - (.tlTarGet.Width + .tlTarGet.left))
- .tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height + 8,
MdlObjSizer.get_object_width(.tlFbMode.Text) + 8)
- .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
2, .tlFbMode.top, .tlBanner.Width - (.tlFbMode.Width + .tlFbMode.Left))
- .tlList.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height +
12, .tlBanner.Width)
- .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height *
6)
- '.tlBanner2.Move(.tlFbMode.left, .FBResolution.top
+ .FBResolution.Height + 16, MdlObjSizer.get_object_width(.tlBanner2.Text)
+ 36)
- '.LiloAppendBox.Move(.tlBanner2.left, .tlBanner2.top
+ .tlBanner2.Height + 4, .ClientWidth - (.LiloAppendBox.x) * 2)
+ .tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height *
1.5), MdlObjSizer.get_object_width(.tlTarGet.Text))
+ .LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 4, .tlTarGet.top,
(.tlBanner.Width / 2.75) - (.tlTarGet.Width + .tlTarGet.left))
+ .tlFbMode.Move(.LiloTarget.Left + LiloTarget.Width +
12, .LiloTarget.top, MdlObjSizer.get_object_width(.tlFbMode.text))
+ .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
4, .tlFbMode.top, .tlBanner.Width - .FBResolution.Left * 1.30)
+ .tlTimeOUt.Move(.tlTarGet.left, .tlTarGet.top + .tlTarGet.Height + 4,
MdlObjSizer.get_object_width(.tlTimeOUt.Text))
+ .sbTimer.Move(.tlTimeOUt.Left + .tlTimeOUt.Width + 4, .tlTimeOUt.top,
60)
+ .tlTimoutSec.Move(.sbTimer.Left + .sbTimer.Width + 4, .sbTimer.top,
MdlObjSizer.get_object_width(.tlTimoutSec.text))
+
+ '.tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height + 8,
MdlObjSizer.get_object_width(.tlFbMode.Text) + 8)
+ '.FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
2, .tlFbMode.top, (.tlBanner.Width / 2) - (.tlFbMode.Width
+ .tlFbMode.Left))
+
+ '.tlDefaultBoot.Move(.tlFbMode.left, .tlFbMode.top + .tlFbMode.Height
+ 4, MdlObjSizer.get_object_width(.tlDefaultBoot.text) + 8)
+ '.cbDefaultOS.Move(.tlDefaultBoot.Left + .tlDefaultBoot.Width +
2, .tlDefaultBoot.top, .tlBanner.Width - (.tlDefaultBoot.width
+ .tldefaultboot.left))
+
+ '.tlTimeOUt.Move(.tlDefaultBoot.left, .tlDefaultBoot.top
+ .tlDefaultBoot.Height + 4, MdlObjSizer.get_object_width(.tlTimeOUt.text)
+ 8)
+ '.sbTimer.Move(.tlTimeOUt.left + .tlTimeOUt.Width + 2, .tlTimeOUt.top,
60)
+ '.tlTimoutSec.Move(.sbTimer.left + .sbTimer.Width + 4, .sbTimer.top,
MdlObjSizer.get_object_width(.tlTimoutSec.text) + 8)
+ .tlList.Move(.tlTimeOUt.left, .tlTimeOUt.top + .tlTimeOUt.Height +
8, .tlBanner.Width)
+ '.tlList.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height +
12, .tlBanner.Width)
+ .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height *
5.5)
+
END WITH
END
-PUBLIC SUB Button1_Click()
-MdlLiloOsList.LIST_LILO_OS_CHOICES
- 'ME.Hide
- 'FrmLiloOsList.Show
-
-END
PUBLIC SUB FBResolution_Click()
DIM box AS TextBox
@@ -92,7 +112,7 @@
FOR EACH box IN MdlLiloOsList.txtAppends
'box.Enabled = FALSE
box.text = Replace(box.text, "splash=silent", "") '"Not available in
\'Standard\' resolution mode"
- box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12
+ box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12
NEXT
ELSE
@@ -106,7 +126,7 @@
END IF
END IF
- box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12
+ box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12
NEXT
END IF
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Fri Aug 8 12:24:44 2008
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,64,61)
+ MoveScaled(0,0,70,69)
Text = ("")
{ tlBanner TextLabel
MoveScaled(1,1,58,4.5)
@@ -12,17 +12,17 @@
Text = ("Don't Install Lilo")
}
{ TabStrip1 TabStrip
- MoveScaled(1,31,61,22)
+ MoveScaled(1,38,61,28)
Index = 0
Text = ("Tab 0")
Index = 0
}
{ tlList TextLabel
- MoveScaled(1,22,57,6)
+ MoveScaled(1,26,57,6)
Text = ("TextLabel1")
}
{ LiloTarget ComboBox
- MoveScaled(13,9,39,3.125)
+ MoveScaled(13,9,31,3.125)
Text = ("")
ReadOnly = True
List = []
@@ -36,9 +36,22 @@
Text = ("Video Resolution")
}
{ FBResolution ComboBox
- MoveScaled(20,14,32,3.125)
+ MoveScaled(20,14,21,3.125)
Text = ("")
ReadOnly = True
List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
+ }
+ { tlTimeOUt TextLabel
+ MoveScaled(1,20,18,3.125)
+ Text = ("Prompt Timeout")
+ Alignment = Align.Normal
+ }
+ { sbTimer SpinBox
+ MoveScaled(20,20,9,3)
+ }
+ { tlTimoutSec TextLabel
+ MoveScaled(30,20,7,3.125)
+ Text = ("Seconds")
+ Alignment = Align.Normal
}
}
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Fri Aug 8 12:24:44 2008
@@ -48,153 +48,14 @@
END
+PUBLIC SUB WRITE_LILO_DOT_CONF()
+DIM sFile AS String
+DIM sEntryLbl, sEntryApnd, sEntryRoot, sEntryInitrd AS String
+
+
+
+END
-
-' PUBLIC SUB LIST_BULK_SELECTION()
-'
-' DIM cb AS CheckBox
-' DIM i, ii, cby AS Integer
-' DIM sFIle AS String[]
-' DIM sCurrLine AS String[]
-' DIM sLine, sPkg, sDesc AS String
-' DIM vsize AS Variant
-' DIM isize AS Integer
-'
-' cby = 4
-'
-' Vmlinuz = NEW Object[]
-'
-' sFIle = Split(File.Load(Temp("SETUP.CONF")), gb.NewLine)
-' FOR i = 0 TO sFIle.count - 1
-' sLine = Trim(sFIle[i])
-' IF Left(sLine, Len("BULK")) = "BULK" THEN
-' sCurrLine = Split(sLine, ":")
-' 'line format is File_name.tlz:Size_kb:Description
-' sPkg = sCurrLine[0]
-' sDesc = sCurrLine[2]
-' vsize = sCurrLine[1]
-' IF InStr(sDesc, "\'") THEN
-' sDesc = Left(sDesc, Len(sDesc) - 1)
-' END IF
-' IF InStr(sPkg, "optional/") THEN
-'
-' cb = NEW CheckBox(FrmPkgSel.scrlInstallOpts) AS "Linux "
-' WITH cb
-' .Text = sDesc & Space(1) & "[ " & CStr(vsize) & " KB
]"
-' .Width = MdlObjSizer.get_object_width(.Text) + 24
-' .x = 4
-' .y = cby
-' .Height = 27
-' .Tag = Right(sPkg, Len(sPkg) - InStr(sPkg, "=") - 1)
-' .Value = TRUE
-' END WITH
-' ME.Vmlinuz.Add(cb)
-' cby = cby + cb.Height + 4
-' END IF
-' END IF
-' NEXT
-'
-' END
-'
-' PUBLIC FUNCTION WRITE_LILOCONF() AS Integer
-'
-' DIM sEntry AS String
-' DIM sPartition AS String
-' DIM sMountPoint AS String
-' DIM sMntOpts AS String
-' DIM i AS Integer
-' DIM sWinPart AS String
-' DIM sLilo AS String
-'
-' FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/lilo.conf to system"
-'
-' sLilo = "# LILO configuration file" &
-' "#generated by vliloconf" &
-' "#" &
-' "#Start LILO global section" &
-'
-' sLilo = sLilo & gb.NewLine &
-' "boot = " & $LILO_TARGET
-' "DEFAULT = linux"
-' "prompt" &
-' "timeout = 100" &
-' "#Override dangerous defaults that rewrite the partition table:" &
-' "change - rules" &
-' " reset" &
-' "compact" &
-' "bitmap = /boot/bitmap/boot.bmp" &
-'
-'
-' ClsPartSel.sRoot & " / " & LCase(ClsPartSel.fRoot) & " " &
ME.fS_oPTIONS(LCase(ClsPartSel.fRoot)) & " 0 1" & gb.NewLine
-'
-' IF ClsPartSel.sTmp THEN
-' sFstab = sFstab & gb.NewLine & ClsPartSel.sTmp & " /tmp " &
LCase(ClsPartSel.fTmp) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fTmp)) & " 0
2 "
-' END IF
-'
-' sLilo = sLilo & "\n\n" &
-' "#VESA framebuffer console @ $CONSOLETYPE" &
-' "vga = $CONSOLENUM" &
-' "#Normal VGA console" &
-' "#vga = normal" &
-' "#VESA framebuffer console @ 1024 x768x64k" &
-' "#vga = 791" &
-' "#VESA framebuffer console @ 1024 x768x32k" &
-' "#vga = 790" &
-' "#VESA framebuffer console @ 1024 x768x256" &
-' "#vga = 773" &
-' "#VESA framebuffer console @ 800 x600x64k" &
-' "#vga = 788" &
-' "#VESA framebuffer console @ 800 x600x32k" &
-' "#vga = 787" &
-' "#VESA framebuffer console @ 800 x600x256" &
-' "#vga = 771" &
-' "#VESA framebuffer console @ 640 x480x64k" &
-' "#vga = 785" &
-' "#VESA framebuffer console @ 640 x480x32k" &
-' "#vga = 784" &
-' "#VESA framebuffer console @ 640 x480x256" &
-' "#vga = 769" &
-' "# END LILO global section" &
-'
-'
-' sLilo = sLilo & "\n"
-'
-' 'Message(sLilo)
-'
-' IF NOT ClsGlobal.sTargetMnt OR ClsGlobal.sTargetMnt = "" THEN
-' ClsGlobal.sTargetMnt = "/mnt/target"
-' END IF
-'
-' ';Message(ClsGlobal.sTargetMnt &/ "etc")
-' ' now save the file to /etc/fstab
-' IF Exist(ClsGlobal.sTargetMnt &/ "etc") = FALSE THEN
-' MKDIR ClsGlobal.sTargetMnt &/ "etc"
-' END IF
-' File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf", SConv(sLilo))
-' 'CATCH
-' 'PRINT ERROR
-' '.RETURN 1
-' 'RETURN 0
-'
-' PUBLIC FUNCTION fFind_WIN() AS String
-' 'PARTS = SHELL "fdisk-l | grep -E '^/dev/.* \* .*(FAT32|HPFS|NTFS|Win)'
| cut -f 1 -d ' '"
-' index = ""
-' FOR PART IN $PARTS; DO
-' let count1 = count1 + 1
-' LILO1_PART[$count1] = "$PART"
-' LILO1_LABEL[$count1] = "Win$index"
-' LILO1_DESC[$count1] = "Windows ($PART)"
-' IF ["$index"]; THEN
-' let index = $index + 1
-' ELSE
-' index = 1
-' fi
-' done
-'
-' ENDIF
-'
-'
-' END
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Fri Aug 8 12:24:44 2008
@@ -211,7 +211,11 @@
'FMain.tvPlan.MoveTo("Prep0")
FMain.tvPlan["Prep0"].Selected = TRUE
'Balloon("Scanning drives for media ... please wait", fmain.pnlWinHost)
+
+RETURN
FrmSelISO.tlDistroDesc.Text = "<b>Scanning system for installable media.
Please wait ...</b>"
+
+
WAIT 1
FrmSelISO.lstInstallableImg.Enabled = FALSE
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Fri Aug 8 12:24:44 2008
@@ -43,7 +43,7 @@
aHandle = Desktop.Find(sWons[i])
IF aHandle.Count = 0 THEN
REPEAT
- WAIT 2
+ WAIT 3
INC i
aHandle = Desktop.Find(sWons[i])
UNTIL
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Fri Aug 8 12:24:44 2008
@@ -21,6 +21,7 @@
PUBLIC txtNames AS Object[]
PUBLIC iAppendLeft AS Integer
PUBLIC cbWins AS Object[]
+PUBLIC bVlCliOption AS Boolean
PUBLIC SUB LIST_WIN_INSTALL_CHOICES(iCurrentTabCnt AS Integer)
DIM sFatList AS String
@@ -84,7 +85,7 @@
.Value = TRUE
END WITH
END WITH ' end jacking with the tabstrip
-
+ NEXT
END IF
SHELL "fdisk -l| grep -E \'^/dev/.* \\* .*(FAT32|HPFS|NTFS|Win)\' | cut
-f 1 -d \' \'" TO sNTFSLst
sNTFSLst = Trim(sNTFSLst)
@@ -203,17 +204,18 @@
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
WITH txtAppnd
- .Move(tl.Left + tl.Width + 8, tl.top, tl.Width)
- IF FrmLilo.sVidMode <> "Standard" THEN
- .Enabled = TRUE
- .text = .text & " splash=silent"
- .Width = FrmLilo.TabStrip1.Width - tl.Width
- ELSE
- '.Enabled = FALSE
- '.Text = "not available in \'Standard\' Resolution mode"
- .Text = .text & Replace(.text, "splash=silent", "")
- .Width = FrmLilo.TabStrip1.Width - tl.Width
- END IF
+ .Move(tl.Left + tl.Width + 8, tl.top,
FrmLilo.TabStrip1.Width - (tl.Width * 1.5))
+ '.Width = FrmLilo.TabStrip1.Width - tl.Width - (tl.left *
4)
+ ' IF FrmLilo.sVidMode <> "Standard" THEN
+ ' .Enabled = TRUE
+ ' .text = .text & " splash=silent"
+ ' '.Width = FrmLilo.TabStrip1.Width - tl.Width - (tl.left
* 4)
+ ' ELSE
+ ' '.Enabled = FALSE
+ ' '.Text = "not available in \'Standard\' Resolution
mode"
+ ' .Text = .text & Replace(.text, "splash=silent", "")
+ ' ' .Width = FrmLilo.TabStrip1.Width - tl.Width -
(tl.left * 2)
+ ' END IF
.Height = 27
txtAppends.Add(txtAppnd)
END WITH
@@ -230,6 +232,7 @@
.Height = 27
.Move(4, tl.top + tl.Height + 12)
END WITH
+
END IF
END IF
@@ -256,6 +259,14 @@
END
+
+PUBLIC SUB VlCliOption_click()
+
+ bVlCliOption = LAST.value
+ PRINT bVlCliOption
+
+END
+
PUBLIC SUB IncludeOs_click()
IF LAST.value = FALSE THEN
|
|
From: <cod...@go...> - 2008-08-08 17:35:25
|
Author: M0...@gm...
Date: Fri Aug 8 10:34:39 2008
New Revision: 112
Modified:
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlLiloOsList.module
Log:
- Began working on adding windows installs to the lilo config options
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Fri Aug 8 10:34:39 2008
@@ -29,7 +29,10 @@
ME.sVidMode = "Standard"
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
MdlLiloOsList.LIST_LILO_OS_CHOICES()
-
+ME.tlList.text = "The following Operating Systems have been detected on
this computer. Choose your desired option " &
+"for each one of them by clicking on each tab. To proceed with the default
pre-set values, simply click \'" & FMain.btnext.text & "\'"
+ME.tlList.Adjust
+ME.TabStrip1.Index = 0
END
PUBLIC SUB YNLiloBox_Click()
@@ -66,7 +69,8 @@
.LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width +
2, .tlTarGet.top, .tlBanner.Width - (.tlTarGet.Width + .tlTarGet.left))
.tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height + 8,
MdlObjSizer.get_object_width(.tlFbMode.Text) + 8)
.FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
2, .tlFbMode.top, .tlBanner.Width - (.tlFbMode.Width + .tlFbMode.Left))
- .TabStrip1.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height *
5)
+ .tlList.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height +
12, .tlBanner.Width)
+ .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height *
6)
'.tlBanner2.Move(.tlFbMode.left, .FBResolution.top
+ .FBResolution.Height + 16, MdlObjSizer.get_object_width(.tlBanner2.Text)
+ 36)
'.LiloAppendBox.Move(.tlBanner2.left, .tlBanner2.top
+ .tlBanner2.Height + 4, .ClientWidth - (.LiloAppendBox.x) * 2)
END WITH
@@ -106,6 +110,12 @@
NEXT
END IF
+
+
+END
+
+PUBLIC SUB tlBanner_MouseDown()
+
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Fri Aug 8 10:34:39 2008
@@ -4,41 +4,41 @@
MoveScaled(0,0,64,61)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(0,0,58,4.5)
+ MoveScaled(1,1,58,4.5)
Text = ("Configure and install lilo (Linux Boot Loader)")
}
- { LiloTarget ComboBox
- MoveScaled(13,10,39,3.125)
- Text = ("")
- ReadOnly = True
- List = []
- }
{ YNLiloBox CheckBox
MoveScaled(1,5,18,3)
Text = ("Don't Install Lilo")
}
- { FBResolution ComboBox
- MoveScaled(20,15,32,3.125)
+ { TabStrip1 TabStrip
+ MoveScaled(1,31,61,22)
+ Index = 0
+ Text = ("Tab 0")
+ Index = 0
+ }
+ { tlList TextLabel
+ MoveScaled(1,22,57,6)
+ Text = ("TextLabel1")
+ }
+ { LiloTarget ComboBox
+ MoveScaled(13,9,39,3.125)
Text = ("")
ReadOnly = True
- List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
+ List = []
}
{ tlTarGet TextLabel
- MoveScaled(1,10,10,3.125)
+ MoveScaled(1,9,10,3.125)
Text = ("Target")
}
{ tlFbMode TextLabel
- MoveScaled(1,15,18,3.125)
+ MoveScaled(1,14,18,3.125)
Text = ("Video Resolution")
}
- { Button1 Button
- MoveScaled(55,57,7,2)
- Text = ("Button1")
- }
- { TabStrip1 TabStrip
- MoveScaled(1,20,61,32)
- Index = 0
- Text = ("Tab 0")
- Index = 0
+ { FBResolution ComboBox
+ MoveScaled(20,14,32,3.125)
+ Text = ("")
+ ReadOnly = True
+ List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
}
}
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Fri Aug 8 10:34:39 2008
@@ -20,12 +20,92 @@
PUBLIC txtAppends AS Object[]
PUBLIC txtNames AS Object[]
PUBLIC iAppendLeft AS Integer
-PUBLIC SUB LIST_LILO_OS_CHOICES()
-
+PUBLIC cbWins AS Object[]
+
+PUBLIC SUB LIST_WIN_INSTALL_CHOICES(iCurrentTabCnt AS Integer)
DIM sFatList AS String
DIM arrFat AS String[]
DIM sNTFSLst AS String
DIM arrNTFS AS String[]
+ DIM iTotalEntries AS Integer
+ DIM i AS Integer
+ DIM cb AS CheckBox
+ DIM tl AS TextLabel
+ DIM tb AS TextBox
+ DIM sWinPart AS String
+ DIM sWinAddr AS String
+
+ ' I'd like to verify that there is actually a windows isntall there...
rather than simply listing every partition
+ ' But I guess listing partitions will do for now
+
+
+
+ SHELL "fdisk -l | grep -E \'^/dev/.* \\* .*(FAT16)\' | cut -f 1 -d \'
\'" TO sFatList
+ sFatList = Trim(sFatList)
+ IF sFatList <> "" THEN
+ arrFat = Split(sFatList, "\n")
+ iTotalEntries = iTotalEntries + (arrFat.count - 1)
+ FOR i = 0 TO arrFat.Count - 1
+ sWinPart = Trim(arrFat[i])
+ sWinAddr = Right(sWinPart, Len(sWinPart) -
RInStr(sWinPart, "/"))
+ WITH FrmLilo.TabStrip1
+ .count = .count + 1
+ .text = "Windows-" & sWinAddr
+ .Tag = sWinPart
+ ' now populate it with the necessary stuff
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinBanner"
+ WITH tl
+ .text = "Operating system found in " & sWinPart
+ .Move(4, 12, MdlObjSizer.get_object_width(.text)
+ 24, 27)
+ .Alignment = Align.Normal
+ END WITH
+
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinName"
+ WITH tl
+ .text = "Name "
+ .Move(tl.left, tl.top + tl.height + 8,
MdlObjSizer.get_object_width(.text) + 8, 27)
+ .Alignment = Align.Normal
+ END WITH
+
+ tb = NEW TextBox(FrmLilo.TabStrip1) AS "WinNameBox"
+ WITH tb
+ .text = FrmLilo.TabStrip1.Current.Text
+ .MaxLength = 15
+ .Height = 27
+ .Width = MdlObjSizer.get_object_width(.text) * 2
+ .Move(tl.left + tl.Width + 8, tl.top)
+ END WITH
+
+
+ cb = NEW CheckBox(FrmLilo.TabStrip1) AS "WinInclude"
+ WITH cb
+ .text = "Include this Operating System in the
boot menu"
+ .Move(tl.left, tl.top + tl.height,
MdlObjSizer.get_object_width(.text) + 36, 27)
+ .Value = TRUE
+ END WITH
+ END WITH ' end jacking with the tabstrip
+
+ END IF
+ SHELL "fdisk -l| grep -E \'^/dev/.* \\* .*(FAT32|HPFS|NTFS|Win)\' | cut
-f 1 -d \' \'" TO sNTFSLst
+ sNTFSLst = Trim(sNTFSLst)
+ IF sNTFSLst <> "" THEN
+ arrNTFS = Split(sNTFSLst, "\n")
+ iTotalEntries = iTotalEntries + (arrNTFS.Count - 1)
+ END IF
+
+ IF iTotalEntries = 0 THEN
+ RETURN ' no need to proceed if no windows installs were found
+ END IF
+
+
+
+END
+
+
+
+PUBLIC SUB LIST_LILO_OS_CHOICES()
+
+
DIM sLinuxList AS String
DIM arrLinux AS String[]
DIM i AS Integer
@@ -47,16 +127,7 @@
'FrmLilo.TabStrip1.Count = 1
cbarr = NEW Object[]
- SHELL "fdisk -l | grep -E \'^/dev/.* \\* .*(FAT16)\' | cut -f 1 -d \'
\'" TO sFatList
- sFatList = Trim(sFatList)
- IF sFatList <> "" THEN
- arrFat = Split(sFatList, "\n")
- END IF
- SHELL "fdisk -l| grep -E \'^/dev/.* \\* .*(FAT32|HPFS|NTFS|Win)\' | cut
-f 1 -d \' \'" TO sNTFSLst
- sNTFSLst = Trim(sNTFSLst)
- IF sNTFSLst <> "" THEN
- arrNTFS = Split(sNTFSLst, "\n")
- END IF
+
SHELL "fdisk -l |grep -E \'83 *Linux\' | cut -f 1 -d \' \'" TO sLinuxList
'sLinuxList = Trim(sLinuxList)
@@ -82,8 +153,11 @@
.text = sLiloDesc & "-" & sShortAddr
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "OSIntro"
WITH tl
- .text = "Operating system installed in " & arrLinux[i]
- .Move(4, 4, MdlObjSizer.get_object_width(.text) + 4, 27)
+ .text = "<b>Operating system installed in " & arrLinux[i]
& "</b>"
+ .Move(4, 16, MdlObjSizer.get_object_width(.text) + 4, 27)
+ '.BackColor = Color.SelectedBackground
+ .Alignment = Align.Normal
+ '.ForeColor = Color.SelectedForeground
END WITH
@@ -143,7 +217,23 @@
.Height = 27
txtAppends.Add(txtAppnd)
END WITH
-
+
+ ' Add an option to boot the recently installed OS to CLI mode
+ ClsPartSel.sRoot = "/dev/hda1"
+ IF sLiloDesc LIKE "Vector" THEN
+ IF arrLinux[i] = ClsPartSel.sRoot THEN
+ cbInclude = NEW CheckBox(FrmLilo.TabStrip1)
AS "VlCliOption"
+ WITH cbInclude
+ .Value = FALSE
+ .text = "Add option to boot this Operating system into
Text mode"
+ .Width = MdlObjSizer.get_object_width(.text) + 36
+ .Height = 27
+ .Move(4, tl.top + tl.Height + 12)
+ END WITH
+ END IF
+ END IF
+
+
END WITH ' end jacking with the tabstrip itself
|
|
From: <cod...@go...> - 2008-08-08 15:34:22
|
Author: M0...@gm...
Date: Fri Aug 8 08:34:16 2008
New Revision: 111
Modified:
branches/iVL/FrmLilo.class
branches/iVL/MdlLiloOsList.module
Log:
- Fix bug in number of tabs created. (remove extra blank tab)
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Fri Aug 8 08:34:16 2008
@@ -36,14 +36,15 @@
IF ME.YNLiloBox.value = TRUE THEN
WITH ME
- .LiloAppendBox.Enabled = FALSE
+' .LiloAppendBox.Enabled = FALSE
.LiloTarget.Enabled = FALSE
.FBResolution.Enabled = FALSE
+ .TabStrip1.Enabled = FALSE
END WITH
ELSE
WITH ME
-
- .LiloAppendBox.Enabled = TRUE
+ .TabStrip1.Enabled = TRUE
+ '.LiloAppendBox.Enabled = TRUE
.LiloTarget.Enabled = TRUE
.FBResolution.Enabled = TRUE
END WITH
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Fri Aug 8 08:34:16 2008
@@ -44,7 +44,7 @@
txtAppends = NEW Object[]
txtNames = NEW Object[]
- FrmLilo.TabStrip1.Count = 1
+ 'FrmLilo.TabStrip1.Count = 1
cbarr = NEW Object[]
SHELL "fdisk -l | grep -E \'^/dev/.* \\* .*(FAT16)\' | cut -f 1 -d \'
\'" TO sFatList
@@ -73,16 +73,13 @@
SHELL "mount " & arrLinux[i] & Space(1) & "/tmp/lilo_tmp" WAIT
' now check for a vmlinuz
IF Exist("/tmp/lilo_tmp/boot/vmlinuz") = TRUE THEN
+ FrmLilo.TabStrip1.Count = FrmLilo.TabStrip1.count +
1 'arrLinux.Count - 1
+
sLiloDesc = ME.ID_DISTRO("/tmp/lilo_tmp")
- FrmLilo.TabStrip1.Count = i + 1
-
- FrmLilo.TabStrip1[i].text = sLiloDesc & "-" & sShortAddr
-
- FrmLilo.TabStrip1[i].text = sLiloDesc & "-" & sShortAddr
- WITH FrmLilo.TabStrip1
+ WITH FrmLilo.TabStrip1
.Index = i
-
+ .text = sLiloDesc & "-" & sShortAddr
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "OSIntro"
WITH tl
.text = "Operating system installed in " & arrLinux[i]
@@ -156,7 +153,16 @@
SHELL "umount /tmp/lilo_tmp" WAIT
NEXT
-
+ FOR i = 0 TO FrmLilo.TabStrip1.Count - 1
+ WITH FrmLilo.TabStrip1
+ .Index = i
+ IF .Children.Count < 1 THEN
+ FrmLilo.TabStrip1[i].Visible = FALSE
+ END IF
+ END WITH
+ NEXT
+
+
END
|
|
From: <cod...@go...> - 2008-08-08 15:02:11
|
Author: M0...@gm...
Date: Fri Aug 8 08:01:15 2008
New Revision: 110
Modified:
branches/iVL/FrmLilo.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLiloOsList.module
Log:
- Fixed problem in LILO setup window
Append options are now available all the time, but the module removes
the "splash={value}" from the append line if
"Standard" resolution is selected.
- Modified OS List module to uniquely label each linux install found. This
is done by adding the partition address to
where the OS is found to the OS name.
- Added limitations to make sure the OS Label is not longer than 15
characters, and does not contain spaces
- Added floppy detection to lilo targets (this will hide the floppy option
if no floppy drive exists (makes sense)
- Added SATA and USB detection for lilo targets. This will allow lilo to be
installed in USB and SATA devices
(LILO WILL work from USB if the BIOS can boot from USB)
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Fri Aug 8 08:01:15 2008
@@ -85,15 +85,22 @@
'MdlLiloOsList.LIST_LILO_OS_CHOICES()
IF Trim(ME.FBResolution.Text) = "Standard" THEN
FOR EACH box IN MdlLiloOsList.txtAppends
- box.Enabled = FALSE
- box.text = "Not available in \'Standard\' resolution mode"
- box.Width = MdlObjSizer.get_object_width(box.text) + 12
+ 'box.Enabled = FALSE
+ box.text = Replace(box.text, "splash=silent", "") '"Not available in
\'Standard\' resolution mode"
+ box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12
NEXT
ELSE
FOR EACH box IN MdlLiloOsList.txtAppends
box.Enabled = TRUE
- box.text = "splash=silent"
+ IF InStr(box.text, "splash=") = FALSE THEN
+ IF box.text <> "" THEN
+ box.text = box.text & " splash=silent"
+ ELSE
+ box.text = "splash=silent"
+ END IF
+
+ END IF
box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12
NEXT
END IF
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Fri Aug 8 08:01:15 2008
@@ -25,8 +25,9 @@
DIM sListarr AS String[]
DIM i AS Integer
DIM sTarget AS String
+ DIM sDump AS String
- SHELL "probedisk | grep disk |cut -f 1 -d \\|" TO sList
+ SHELL "probedisk | grep -v cdrom |cut -f 1 -d \\|" TO sList
sList = Trim(sList)
sListarr = Split(sList, "\n")
FOR i = 0 TO sListarr.count - 1
@@ -38,8 +39,10 @@
IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
.Add("Sector")
END IF
-
+ SHELL "lsdev | grep floppy" TO sDump
+ IF sDump <> "" THEN
.Add("Floppy")
+ END IF
END WITH
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Fri Aug 8 08:01:15 2008
@@ -18,6 +18,7 @@
PRIVATE cbarr AS Object[]
PRIVATE sText AS String
PUBLIC txtAppends AS Object[]
+PUBLIC txtNames AS Object[]
PUBLIC iAppendLeft AS Integer
PUBLIC SUB LIST_LILO_OS_CHOICES()
@@ -37,10 +38,12 @@
DIM txtAppnd AS TextBox
DIM cbInclude AS CheckBox
DIM tl AS TextLabel
+ DIM sShortAddr AS String
x = 4
y = 4
txtAppends = NEW Object[]
+txtNames = NEW Object[]
FrmLilo.TabStrip1.Count = 1
cbarr = NEW Object[]
@@ -66,22 +69,23 @@
'create a temporary monunt dir
TRY MKDIR "/tmp/lilo_tmp"
FOR i = 0 TO arrLinux.Count - 1
+ sShortAddr = Right(arrLinux[i], Len(arrLinux[i]) -
RInStr(arrLinux[i], "/"))
SHELL "mount " & arrLinux[i] & Space(1) & "/tmp/lilo_tmp" WAIT
' now check for a vmlinuz
IF Exist("/tmp/lilo_tmp/boot/vmlinuz") = TRUE THEN
sLiloDesc = ME.ID_DISTRO("/tmp/lilo_tmp")
FrmLilo.TabStrip1.Count = i + 1
- IF sLiloDesc <> "Linux" THEN
- FrmLilo.TabStrip1[i].text = sLiloDesc & " Linux"
- ELSE
- FrmLilo.TabStrip1[i].text = sLiloDesc
- END IF
+
+ FrmLilo.TabStrip1[i].text = sLiloDesc & "-" & sShortAddr
+
+ FrmLilo.TabStrip1[i].text = sLiloDesc & "-" & sShortAddr
+
WITH FrmLilo.TabStrip1
.Index = i
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "OSIntro"
WITH tl
- .text = "Operating system resides in " & arrLinux[i]
+ .text = "Operating system installed in " & arrLinux[i]
.Move(4, 4, MdlObjSizer.get_object_width(.text) + 4, 27)
END WITH
@@ -107,11 +111,15 @@
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "NameBox"
WITH txtAppnd
.Width = tl.Width * 4
- .text = sLiloDesc
+ .text = FrmLilo.TabStrip1.Current.text 'sLiloDesc
.Height = tl.Height
.x = tl.left + tl.Width + 8
.y = tl.Top
+ .MaxLength = 15
+ .tag = arrLinux[i]
+
END WITH
+ txtNames.Add(txtAppnd)
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "AppndLbl"
WITH tl
.text = "Kernel boot options"
@@ -127,12 +135,13 @@
.Move(tl.Left + tl.Width + 8, tl.top, tl.Width)
IF FrmLilo.sVidMode <> "Standard" THEN
.Enabled = TRUE
- .text = "splash=silent"
+ .text = .text & " splash=silent"
.Width = FrmLilo.TabStrip1.Width - tl.Width
ELSE
- .Enabled = FALSE
- .Text = "not available in \'Standard\' Resolution mode"
- .Width = MdlObjSizer.get_object_width(.text) + 12
+ '.Enabled = FALSE
+ '.Text = "not available in \'Standard\' Resolution mode"
+ .Text = .text & Replace(.text, "splash=silent", "")
+ .Width = FrmLilo.TabStrip1.Width - tl.Width
END IF
.Height = 27
txtAppends.Add(txtAppnd)
@@ -157,6 +166,22 @@
Message("Excluding " & FrmLilo.TabStrip1.Current.text & " from the boot
menu")
END IF
+
+END
+
+PUBLIC SUB NameBox_keyrelease()
+
+ DIM tx AS TextBox
+ FOR EACH tx IN txtNames
+ IF tx.tag = LAST.tag THEN
+ tx.text = Replace(LAST.text, " ", "")
+ FrmLilo.TabStrip1.Current.text = LAST.text
+ END IF
+
+
+ NEXT
+
+
END
|
|
From: <cod...@go...> - 2008-08-07 22:01:27
|
Author: M0...@gm...
Date: Thu Aug 7 15:01:23 2008
New Revision: 109
Modified:
branches/iVL/FrmLilo.class
branches/iVL/MdlLiloOsList.module
branches/iVL/Order
Log:
- Lilo OS choices is getting better.
- Began lilo.conf construct ( see Order)
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Thu Aug 7 15:01:23 2008
@@ -20,6 +20,8 @@
PUBLIC SUB Form_Open()
+
+
' FMain.FrmCurr = ME
' FMain.tvPlan["Conf0"].Selected = TRUE
' FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
@@ -78,9 +80,24 @@
END
PUBLIC SUB FBResolution_Click()
-
+ DIM box AS TextBox
ME.sVidMode = Trim(ME.FBResolution.Text)
- MdlLiloOsList.LIST_LILO_OS_CHOICES()
+ 'MdlLiloOsList.LIST_LILO_OS_CHOICES()
+ IF Trim(ME.FBResolution.Text) = "Standard" THEN
+ FOR EACH box IN MdlLiloOsList.txtAppends
+ box.Enabled = FALSE
+ box.text = "Not available in \'Standard\' resolution mode"
+ box.Width = MdlObjSizer.get_object_width(box.text) + 12
+ NEXT
+
+ ELSE
+ FOR EACH box IN MdlLiloOsList.txtAppends
+ box.Enabled = TRUE
+ box.text = "splash=silent"
+ box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12
+ NEXT
+ END IF
+
END
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Aug 7 15:01:23 2008
@@ -17,6 +17,8 @@
PRIVATE cbarr AS Object[]
PRIVATE sText AS String
+PUBLIC txtAppends AS Object[]
+PUBLIC iAppendLeft AS Integer
PUBLIC SUB LIST_LILO_OS_CHOICES()
DIM sFatList AS String
@@ -38,6 +40,7 @@
x = 4
y = 4
+txtAppends = NEW Object[]
FrmLilo.TabStrip1.Count = 1
cbarr = NEW Object[]
@@ -73,6 +76,8 @@
ELSE
FrmLilo.TabStrip1[i].text = sLiloDesc
END IF
+ WITH FrmLilo.TabStrip1
+ .Index = i
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "OSIntro"
WITH tl
@@ -113,47 +118,29 @@
.Move(4, txtAppnd.top + txtAppnd.Height + 4,
MdlObjSizer.get_object_width(.text))
.Height = 27
.Alignment = Align.Normal
+ ME.iAppendLeft = .x + .Width + 4
END WITH
- txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
+
+ txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
WITH txtAppnd
.Move(tl.Left + tl.Width + 8, tl.top, tl.Width)
IF FrmLilo.sVidMode <> "Standard" THEN
.Enabled = TRUE
.text = "splash=silent"
+ .Width = FrmLilo.TabStrip1.Width - tl.Width
ELSE
.Enabled = FALSE
- .Text = "not available"
+ .Text = "not available in \'Standard\' Resolution mode"
+ .Width = MdlObjSizer.get_object_width(.text) + 12
END IF
.Height = 27
+ txtAppends.Add(txtAppnd)
END WITH
-
- ' ' '
- ' ' ' 'Message.Info(FrmLilo.TabStrip1.Count)
- ' ' ' FrmLilo.TabStrip1[FrmLilo.TabStrip1.Count].text =
sLiloDesc
- ' ' ' RETURN
- ' ' ' cbLiloItem = NEW CheckBox(FrmLiloOsList.scrlOsList)
AS "OsList"
- ' ' '
- ' ' '
- ' ' ' WITH cbLiloItem
- ' ' ' .x = x
- ' ' ' .y = y
- ' ' ' IF sLiloDesc <> "Linux" THEN
- ' ' ' .Text = sLiloDesc & Space(1) & "Linux" & Space(1)
& "on" & Space(1) & arrLinux[i]
- ' ' ' ELSE
- ' ' ' .Text = sLiloDesc
- ' ' ' END IF
- ' ' '
- ' ' ' .tag = arrLinux[i]
- ' ' ' .Height = 27
- ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 36 '
allow room for the checkbox
- ' ' ' .Value = TRUE
- ' ' '
- ' ' ' END WITH
- ' ' '
- ' ' ' cbarr.Add(cbLiloItem)
- ' ' ' y = y + cbLiloItem.Height + 4
+
+ END WITH ' end jacking with the tabstrip itself
+
END IF
@@ -164,6 +151,16 @@
END
+
+PUBLIC SUB IncludeOs_click()
+ IF LAST.value = FALSE THEN
+Message("Excluding " & FrmLilo.TabStrip1.Current.text & " from the boot
menu")
+END IF
+
+
+END
+
+
PUBLIC SUB OsList_click()
Modified: branches/iVL/Order
==============================================================================
--- branches/iVL/Order (original)
+++ branches/iVL/Order Thu Aug 7 15:01:23 2008
@@ -1,27 +1,12 @@
-(09:55:32 AM) uelsk8s: 1 ... $MNTPNT/veclinux/required veclinux.tlz, then
vlconfig.tlz
-(09:55:32 AM) uelsk8s: 2 $MNTPNT/veclinux/optional
-(09:55:32 AM) uelsk8s: 3 $mntpnt/packages/* (except required)
-(09:55:32 AM) uelsk8s: 4 $mntpint/packages/required
-(09:55:32 AM) uelsk8s: 5 $MNTPNT/veclinux/required/vlconfig2.tlz
-(09:55:57 AM) uelsk8s: because they are not listed in packages.txt for the
user to select from
-(09:56:13 AM) uelsk8s: they have to be installed or the install will break
-
-
-(07:38:13 AM) uelsk8s: for i in $(ls packages/*/*.tlz|grep -v required);do
install-pkg $i $ROOT || echo FAILED;done
-
-TODO:
- + Add option to format partition to swap
- + Modify partition listing so that it hides (or disables) selecting the
partition which hosts the ISO to be used for the new install
- + Add option to mount (but not format) linux partitions. (add
/mnt/<partition_addr> to the combobox list)
-
-
- Required bulkd
- optional (selected) bulks
- optional (selected) from PACKAGES.TXT
- packages/required
- CONF from SETUP.CONF
- Kernel (below)
-
-
-
- + need to copy SOURCE_MNT_POINT/isolinux/kernel/sata to
TARGET_MNT_POINT/boot/vmlinuz-2.6.25.7
\ No newline at end of file
+HOW TO GENERATE LILO.CONF IDEA
+1) Populate the tabstrip in FrmLilo with all the OSs found in the system
+2) let the usr customize each OS's append lines and other options?
+3) Provide a button for the user to press when done. On this event, the
following needs to happen
+ * Run through each tab in the tabstrip and determine if the checkbox
has been ticked on or off
+ + if off, then exclude that entire section from the lilo.conf else
+ - Generate a lilo.conf entry with the information in that tab
+Hope this works.
+For WINDOWS partitions (installations) simply list the install location
+ (maybe look for WINDOWS or WINDOWS\SYSTEM32 to be sure it's a real
install)
+ and do not offer any other options. just to include / exclude from the
menu
+
\ No newline at end of file
|
|
From: <cod...@go...> - 2008-08-07 20:33:50
|
Author: M0...@gm...
Date: Thu Aug 7 13:33:24 2008
New Revision: 108
Modified:
branches/iVL/MdlCore.module
branches/iVL/MdlDiskPart.module
Log:
Squashed bug in gparted embedder
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Thu Aug 7 13:33:24 2008
@@ -51,8 +51,11 @@
SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/ sISO
& Space(1) & "/mnt/loop" WAIT
IF Exist("/mnt/loop/veclinux/SETUP.CONF") = TRUE
THEN
IF FrmSelISO.lstInstallableImg.Find(sISO & "
on " & sDrive) = -1 THEN
+
File.Save(Temp(siso),
File.Load("/mnt/loop/veclinux/SETUP.CONF"))
+
FrmSelISO.lstInstallableImg.Add(sISO & " on " &
sDrive)
+
END IF
END IF
SHELL "umount /mnt/loop" WAIT
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Thu Aug 7 13:33:24 2008
@@ -25,61 +25,53 @@
DIM iHandle AS Integer
DIM i AS Integer = 0
DIM sDump AS String
+ DIM sWins AS String = "GParted,/dev/sda - GParted,/dev/hda - GParted"
+ DIM sWons AS String[] = Split(sWins, ",")
'Desktop.Find("", "GParted")
- IF Exist("/usr/bin/gparted") = FALSE THEN
+ IF Exist("/usr/sbin/gparted") = FALSE THEN
Message.Error("Gparted was not found on this system. Please install
gparted and try again")
RETURN
END IF
FrmDiskPart.tlBanner.Text = "<h3>Loading gparted .... Please wait</h3>"
- SHELL "/usr/bin/gparted"
- WAIT 3
+ SHELL "/usr/sbin/gparted"
+ WAIT
- sTitle = "/dev/hda - GParted"
- sTitle1 = "/dev/sda - GParted"
- sTitle2 = "GParted"
- 'aHandle = Desktop.Find(sTitle)
- aHandle = Desktop.Find(sTitle)
- ' ' ' IF aHandle = "" THEN
- ' ' ' aHandle = Desktop.Find(sTitle1)
- ' ' ' END IF
- ' ' '
- ' ' ' IF Left(sTitle, 2) = "0x" THEN
- ' ' ' iHandle = Val("&" & Mid$(sTitle, 3))
- ' ' ' ELSE IF Left(sTitle) = "&" THEN
- ' ' ' iHandle = Val(sTitle)
- ' ' ' ELSE
-
- 'Message.Info(aHandle[0])
-
+ i = 0
+ aHandle = Desktop.Find(sWons[i])
IF aHandle.Count = 0 THEN
- aHandle = Desktop.Find(sTitle1)
+ REPEAT
+ WAIT 2
+ INC i
+ aHandle = Desktop.Find(sWons[i])
+ UNTIL
+ aHandle.Count > 0 OR i = sWons.count - 1
END IF
- IF aHandle.Count = 0 THEN
- aHandle = Desktop.Find(sTitle2) ' gparted cannot find drives, but it
loaded ;)
- 'END IF
+
IF aHandle.Count = 0 THEN
Message("Setup is unable to successfully run gparted on this
system. This may be a sign of \n" &
"a bad install media. Setup cannot continue.")
RETURN
- END IF
+ 'END IF
ELSE IF aHandle.Count >= 2 THEN
Message("Several windows found. I take the first one!")
ENDIF
+ 'ELSE
iHandle = aHandle[0]
'ENDIF
'TRY embEmbedder.Embed(iHandle)
- IF iHandle <> ""
+
TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
- IF ERROR THEN Message.Warning(Error.Text)
- END IF
+ CATCH
+ Message.Error(Error.Text & gb.NewLine & Error.Where)
+
END
PUBLIC FUNCTION FIND_DOS_PARTITIONS(sDev AS String) AS Boolean
|
14 messages has been excluded from this view by a project administrator.
