Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r124 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-08-14 19:12:14
|
Author: M0...@gm...
Date: Thu Aug 14 12:11:49 2008
New Revision: 124
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmInstallSys.class
branches/iVL/FrmLilo.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlInstallSys.module
Log:
- Small fixes to the LILO virtual objects to keep user from inserting
spaces in name labels
- Fixed problem with detecting the partition types after install
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Aug 14 12:11:49 2008
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:272
+#: FMain.class:273
msgid "Process Overview"
msgstr ""
-#: FMain.class:291
+#: FMain.class:292
msgid "Next"
msgstr ""
-#: FMain.class:297
+#: FMain.class:298
msgid "Back"
msgstr ""
-#: FMain.class:303
+#: FMain.class:304
msgid "Exit"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Aug 14 12:11:49 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 Thu Aug 14 12:11:49 2008
@@ -44,7 +44,8 @@
PictureBox1.Background = Color.SelectedBackground
PictureBox1.Stretch = TRUE
MdlCore.PREPARE_INSTALL_LAYOUT
-FrmSelISO.Show
+FrmSelISO.Reparent(ME.pnlwinhost)
+'FrmSelISO.Show
'FrmSelISO.Hide
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Thu Aug 14 12:11:49 2008
@@ -43,8 +43,9 @@
-'ME.BEGIN_PROCESS()
-MdlSetup.RUN_CREDITS("/mnt/loop/CREDIT", ME.tlCredits)
+ME.BEGIN_PROCESS() ' COMMENTED FOR TESTING PURPOSES
+'MdlSetup.RUN_CREDITS("/mnt/loop/CREDIT", ME.tlCredits)
+MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
ME.tmCredits.Enabled = TRUE
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Thu Aug 14 12:11:49 2008
@@ -142,6 +142,7 @@
PUBLIC SUB Form_Menu()
- MdlConfLilo.WRITE_LILO_DOT_CONF
+ 'MdlConfLilo.WRITE_LILO_DOT_CONF\
+ MdlConfLilo.GENERATE_LILO_DOT_CONF()
END
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Thu Aug 14 12:11:49 2008
@@ -19,6 +19,22 @@
' PUBLIC Vmlinuz AS Object[]
+PRIVATE sDotConf AS String
+
+PUBLIC FUNCTION WRITE_LILO_DOT_CONF() AS Integer
+
+ DIM sGlbl AS String
+ DIM iTimeout AS Integer
+ DIM sTrgt AS String
+ DIM sFB AS String
+
+
+END
+
+
+
+
+
PUBLIC SUB DISPLAY_LILO_TARGET_OPTIONS()
DIM sList AS String
@@ -48,7 +64,7 @@
END
-PUBLIC SUB WRITE_LILO_DOT_CONF()
+PUBLIC SUB GENERATE_LILO_DOT_CONF()
DIM sFile AS String
DIM tb AS TextBox
@@ -132,98 +148,8 @@
sFile = sFile & sWinSection
NEXT
+sDotConf = Trim(sFile)
-Message(sFile)
-RETURN
-FrmLilo.TabStrip1.Index = 0
- 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)
-
-
- IF sMatchTag = ClsPartSel.sRoot THEN
- IF MdlLiloOsList.bVlCliOption = TRUE THEN
- 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
-
- 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)
-
-
-
-
END
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Aug 14 12:11:49 2008
@@ -89,6 +89,8 @@
DIM sPartFmt AS String
+ 'FOR testing purposes
+ ClsPartSel.sRoot = "/home/moises/mnt/target"
@@ -97,32 +99,33 @@
' 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
+ SHELL "mount | grep -m 1 \'" & ClsPartSel.sRoot & "\' | cut -f 5 -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
+ SHELL "mount | grep -m 1 \'" & ClsPartSel.sHome & "\' | cut -f 5 -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
+ SHELL "mount | grep -m 1 \'" & ClsPartSel.sUsr & "\' | cut -f 5 -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
+ SHELL "mount | grep -m 1 \'" & ClsPartSel.sVar & "\' | cut -f 5 -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
+ SHELL "mount | grep -m 1 \'" & ClsPartSel.sOpt & "\' | cut -f 5 -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
+ SHELL "mount | grep -m 1 \'" & ClsPartSel.sTmp & "\' | cut -f 5 -d \'
\'" TO sPartFmt
sPartFmt = Trim(sPartFmt)
ClsPartSel.fTmp = sPartFmt
|
