Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r147 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-08-27 15:14:36
|
Author: m0e.lnx
Date: Wed Aug 27 08:13:03 2008
New Revision: 147
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/FrmPartSel.class
branches/iVL/FrmWinDrives.class
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlPartSel.module
Log:
- Added code to allow a single selection of each mount point
- Fixed MdlInstallSys.WRITE_NEW_FSTAB to make sure the correct systax is
printed
to propperly list all linux and windows paritions on fstab
- Changed the way the partition selections are picked up. Rather than
looking in
the variables class, we now cycle the object[] to find wach object with a
value
and use that object's .tag and .text property to set the correct values
in fstab
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/Area-51/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:166
+#: FrmPartSel.class:172
msgid "Please select the partitions you wish to use and how to use them"
msgstr ""
-#: FrmPartSel.class:175
+#: FrmPartSel.class:181
msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
msgstr ""
-#: FrmPartSel.class:176
+#: FrmPartSel.class:182
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr ""
-#: FrmPartSel.class:181
+#: FrmPartSel.class:187
msgid "Help"
msgstr ""
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/FrmWinDrives.class
+# /home/vluser/Area-51/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmWinDrives.class:68
+#: FrmWinDrives.class:74
msgid "Select the windows partitions you would like to mount during boot"
msgstr ""
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -1,4 +1,4 @@
-# /home/moe/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 Wed Aug 27 08:13:03 2008
@@ -33,7 +33,7 @@
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
+ME.TabStrip1.Index = MdlLiloOsList.iVltag
MdlLiloOsList.bVlCliOption = FALSE
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Wed Aug 27 08:13:03 2008
@@ -145,3 +145,9 @@
END
+
+PUBLIC SUB Form_Menu()
+
+ MdlInstallSys.WRITE_NEW_FSTAB()
+
+END
Modified: branches/iVL/FrmWinDrives.class
==============================================================================
--- branches/iVL/FrmWinDrives.class (original)
+++ branches/iVL/FrmWinDrives.class Wed Aug 27 08:13:03 2008
@@ -44,3 +44,9 @@
END
+
+PUBLIC SUB Form_Menu()
+
+ MdlInstallSys.WRITE_NEW_FSTAB()
+
+END
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Wed Aug 27 08:13:03 2008
@@ -89,7 +89,7 @@
DIM sWinMntPnt AS String
DIM sFstab AS String
DIM sPartFmt AS String
- DIM cb AS ComboBox
+ DIM cb, mt AS ComboBox
DIM sRes, sDrive, sBlank, sPartNo AS String
@@ -157,46 +157,57 @@
-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
-IF ClsPartSel.sUsr THEN
- sFstab = sFstab & gb.NewLine & ClsPartSel.sUsr & " /usr " &
LCase(ClsPartSel.fUsr) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fUsr)) & " 0
2 "
-END IF
-IF ClsPartSel.sOpt THEN
- sFstab = sFstab & gb.NewLine & ClsPartSel.sopt & " /opt " &
LCase(ClsPartSel.fOpt) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fOpt)) & " 0
2 "
-END IF
-IF ClsPartSel.sVar THEN
- sFstab = sFstab & gb.NewLine & ClsPartSel.sVar & " /var " &
LCase(ClsPartSel.fVar) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fVar)) & " 0
2 "
-END IF
-IF ClsPartSel.sTmp THEN
- sFstab = sFstab & gb.NewLine & ClsPartSel.sTmp & " /tmp " &
LCase(ClsPartSel.fTmp) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fTmp)) & " 0
2 "
-END IF
-IF ClsPartSel.sLinuxPart THEN
- FOR i = 0 TO ClsPartSel.sLinuxPart.Count - 1
- sLinPart = ClsPartSel.sLinuxPart[i]
- sLinMntPnt = ClsPartSel.sLinuxPart[i]
- NEXT
-ENDIF
+sFstab = sFstab & gb.NewLine
+' ' ' ClsPartSel.sRoot & Space(5) & "/" & Space(5) &
LCase(ClsPartSel.fRoot) & Space(5) & ME.fS_oPTIONS(LCase(ClsPartSel.fRoot))
& Space(5) & "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
+' ' ' IF ClsPartSel.sUsr THEN
+' ' ' sFstab = sFstab & gb.NewLine & ClsPartSel.sUsr & " /usr " &
LCase(ClsPartSel.fUsr) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fUsr)) & " 0
2 "
+' ' ' END IF
+' ' ' IF ClsPartSel.sOpt THEN
+' ' ' sFstab = sFstab & gb.NewLine & ClsPartSel.sopt & " /opt " &
LCase(ClsPartSel.fOpt) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fOpt)) & " 0
2 "
+' ' ' END IF
+' ' ' IF ClsPartSel.sVar THEN
+' ' ' sFstab = sFstab & gb.NewLine & ClsPartSel.sVar & " /var " &
LCase(ClsPartSel.fVar) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fVar)) & " 0
2 "
+' ' ' END IF
+' ' ' IF ClsPartSel.sTmp THEN
+' ' ' sFstab = sFstab & gb.NewLine & ClsPartSel.sTmp & " /tmp " &
LCase(ClsPartSel.fTmp) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fTmp)) & " 0
2 "
+' ' ' END IF
+' ' ' IF ClsPartSel.sLinuxPart THEN
+' ' ' FOR i = 0 TO ClsPartSel.sLinuxPart.Count - 1
+' ' ' sLinPart = ClsPartSel.sLinuxPart[i]
+' ' ' sLinMntPnt = ClsPartSel.sLinuxPart[i]
+' ' ' NEXT
+' ' ' ENDIF
' nOW LETS' GET THE REST OF THE PARTITIONS IN THERE
FOR EACH CB IN MdlPartSel.oMountPoints
+ IF cb.text <> "Not Used" THEN
+
- IF InStr(cb.text, "/mnt/") = TRUE THEN
+ 'IF Left(Trim(cb.text), Len("/mnt")) = "/mnt" THEN
sDrive = Left(cb.tag, Len("/dev/hda"))
sPartNo = Right(cb.tag, Len(cb.tag) - Len(sDrive))
+
IF Len(sPartNo) > 1 THEN
sBlank = ""
ELSE
sBlank = " "
END IF
-
- SHELL "export sfmt=$(parted " & sDrive & " print | grep ^\'" &
sBlank & sPartNo & "\'); echo $sfmt | cut -f 6 -d \' \'" TO sRes
+
+ FOR EACH mt IN MdlPartSel.oFsTypes
+ IF mt.Tag = cb.Tag THEN
+ IF mt.text = "Do not format" THEN
+ SHELL "export sfmt=$(parted " & sDrive & " print | grep
^\'" & sBlank & sPartNo & "\'); echo $sfmt | cut -f 6 -d \' \'" TO sRes
+ ELSE
+ sRes = LCase(mt.text)
+ END IF
+ END IF
+ NEXT
- sFstab = sFstab & gb.NewLine & cb.tag & Space(1) & cb.Text &
Space(1) & sRes & Space(1) & ME.fS_oPTIONS(sRes) & Space(1) & " 0 2 "
+ sFstab = sFstab & cb.tag & Space(5) & Trim(cb.Text) & Space(5) &
Trim(sRes) & Space(5) & ME.fS_oPTIONS(sRes) & Space(5) & " 0 2 " & "\n"
TRY MKDIR ClsGlobal.sTargetMnt &/ cb.Text
END IF
NEXT
@@ -208,6 +219,7 @@
"#/dev/hda1 /mnt/win ntfs umask=0 0 0\n"
' LET'S GET THE WINDOWS PARTITIONS IN HERE
+ IF MdlWinDrives.oWMntPoints THEN
FOR EACH cb IN MdlWinDrives.oWMntPoints
IF cb.text <> "Do not mount" THEN
sDrive = Left(cb.tag, Len("/dev/hda"))
@@ -218,14 +230,19 @@
sBlank = " "
END IF
SHELL "export sfmt=$(parted " & sDrive & " print | grep ^\'" &
sBlank & sPartNo & "\'); echo $sfmt | cut -f 6 -d \' \'" TO sRes
- IF sRes = "fat32" OR sRes = "fat16" THEN sRes = "vfat"
+ sRes = Trim(sRes)
+ IF sRes = "fat32" THEN
+ sRes = "vfat"
+ ELSE IF sRes = "fat16" THEN
+ sRes = "vfat"
+ END IF
sFstab = sFstab & "\n" &
- cb.tag & Space(1) & cb.text & Space(1) & sRes & Space(1) &
ME.fS_oPTIONS(sRes) & " 0 0 "
+ cb.tag & Space(5) & Trim(cb.text) & Space(5) & Trim(sRes) & Space(5)
& ME.fS_oPTIONS(sRes) & " 0 0 "
END IF
' create the mount point for the target
TRY MKDIR ClsGlobal.sTargetMnt &/ cb.Text
NEXT
-
+ END IF
sFstab = sFstab & "\n\n" &
"# Floppy disks \n" &
@@ -270,10 +287,11 @@
' 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" &/ "fstab", SConv(sFstab))
+ ' ' ' IF Exist(ClsGlobal.sTargetMnt &/ "etc") = FALSE THEN
+ ' ' ' MKDIR ClsGlobal.sTargetMnt &/ "etc"
+ ' ' ' END IF
+ ' ' ' File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "fstab",
SConv(sFstab))
+ File.Save("/home/vluser/Area-51/fstab", SConv(sFstab))
END
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Wed Aug 27 08:13:03 2008
@@ -27,6 +27,7 @@
PUBLIC arrWinInstalls AS Object[]
PUBLIC arrWinLabels AS Object[]
PRIVATE sTmpTxt AS String
+PUBLIC iVlTag AS Integer
PUBLIC SUB LIST_WIN_INSTALL_CHOICES(iCurrentTabCnt AS Integer)
DIM sFatList AS String
@@ -173,6 +174,11 @@
NEXT
END IF
+
+
+
+
+
END
PUBLIC SUB WinLbl_keyrelease()
@@ -364,8 +370,9 @@
.tag = arrLinux[i]
.Background = Color.Background
END WITH
-
+ ME.iVlTag = FrmLilo.TabStrip1.Index
END IF
+
END IF
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Wed Aug 27 08:13:03 2008
@@ -171,12 +171,12 @@
.y = y
.ReadOnly = TRUE
.Width = tl.Width
- .Add("XFS")
- .Add("ReiserFS")
- .Add("Ext2")
- .Add("Ext3")
- .Add("JFS")
.Add("Do not format")
+ .Add("reiserfs")
+ .Add("ext2")
+ .Add("ext3")
+ .Add("jfs")
+ .Add("xfs")
'.Add("swap")
IF InStr(Trim(FrmSelISO.lstInstallableImg.Text), .Tag)
THEN
.Enabled = FALSE
@@ -287,6 +287,16 @@
'DIM sTag AS String = LAST.tag
'DIM sText AS String = Trim(LAST.text)
+ FOR EACH sdropdwn IN ME.oMountPoints
+ IF LAST.text <> "Not Used" AND LAST.text = sdropdwn.Text AND LAST.tag
<> sdropdwn.tag THEN
+
+ Message.Error("Please select only one " & LAST.text & " partition")
+ LAST.text = "Not Used"
+ STOP EVENT
+ END IF
+ NEXT
+
+
FOR EACH sdropdwn IN oFsTypes
IF sdropdwn.tag = LAST.tag THEN
sdropdwn.Enabled = TRUE
@@ -295,6 +305,8 @@
END IF
sdropdwn.Text = "Do not format"
END IF
+
+
NEXT
SELECT CASE LAST.text
|
