From: <cod...@go...> - 2009-01-23 05:06:33
|
Author: uelsk8s Date: Thu Jan 22 20:16:44 2009 New Revision: 471 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/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/.project branches/iVL/ClsPartSel.class branches/iVL/FrmPartSel.class branches/iVL/MdlConfLilo.module branches/iVL/MdlPartSel.module branches/iVL/MdlVerifyMedia.module branches/iVL/installer.gambas Log: add ignore-table lilo.conf attempt to add boot partition option Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/.project +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/ClsGlobal.class +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/ClsPartSel.class +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/ClsWinDrives.class +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FMain.class +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmDiskPart.class +# /home/uel/gui-installer/FrmDiskPart.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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmPartScheme.class +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmPartSel.class +# /home/uel/gui-installer/FrmPartSel.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -14,75 +14,75 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "ABOUT SYSTEM PARTITIONING IN LINUX" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "Linux is a modular operating system. This means that is has the ability to store system and" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "user data separately for added data security. You may install the system to a single partition" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "by simply selecting a \"/\" value on this screen. The rest is optional. The following is a" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "suggested setup for a typical Linux installation" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "Used to store system data. This particular install requires a minimum of" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "for this" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "but you should consider a higher value to make sure you have room to install additional software" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "in case you wish to." msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "Used to store user documents, pictures, videos. Give yourself as much room as you want" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "Typically, you want to use the largest partition for this." msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "Using a swap partition is suggested if your total RAM is less than 1GB. Suggested amount" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "for this is" msgstr "" -#: FrmPartSel.class:150 +#: FrmPartSel.class:155 msgid "but can also be calculated as 2 times your amount of RAM" msgstr "" -#: FrmPartSel.class:181 +#: FrmPartSel.class:186 msgid "Please select the partitions you wish to use and how to use them" msgstr "" -#: FrmPartSel.class:186 +#: FrmPartSel.class:191 msgid "Help" msgstr "" -#: FrmPartSel.class:206 +#: FrmPartSel.class:211 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:207 +#: FrmPartSel.class:212 msgid "Detect and Setup Windows partitions for auto-mounting at boot" msgstr "" Modified: branches/iVL/.lang/FrmPkgSel.pot ============================================================================== --- branches/iVL/.lang/FrmPkgSel.pot (original) +++ branches/iVL/.lang/FrmPkgSel.pot Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmPkgSel.class +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmSelISO.class +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmSummary.class +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmWinDrives.class +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlCore.module +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlDiskPart.module +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlObjSizer.module +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlPartSel.module +# /home/uel/gui-installer/MdlPartSel.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -34,11 +34,11 @@ msgid "Not Used" msgstr "" -#: MdlPartSel.module:299 +#: MdlPartSel.module:300 msgid "Please select only one " msgstr "" -#: MdlPartSel.module:299 +#: MdlPartSel.module:300 msgid "partition" msgstr "" Modified: branches/iVL/.lang/MdlPkgSel.pot ============================================================================== --- branches/iVL/.lang/MdlPkgSel.pot (original) +++ branches/iVL/.lang/MdlPkgSel.pot Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlPkgSel.module +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlSetup.module +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlSummarize.module +# /home/uel/gui-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 Thu Jan 22 20:16:44 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlWinDrives.module +# /home/uel/gui-installer/MdlWinDrives.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.project ============================================================================== --- branches/iVL/.project (original) +++ branches/iVL/.project Thu Jan 22 20:16:44 2009 @@ -2,7 +2,7 @@ # Compiled with Gambas 2.10.2 Title=VectorLinux Installer Startup=MdlCore -Version=0.1.22 +Version=0.1.24 Library=gb.gtk Library=gb.form Library=gb.debug @@ -17,6 +17,7 @@ Language=en_US ControlPublic=1 ModulePublic=1 +ExecPath=/home/uel/gui-installer/installer.gambas Maintainer=M0E-lnx Vendor=VectorLinux Address=M0...@gm... Modified: branches/iVL/ClsPartSel.class ============================================================================== --- branches/iVL/ClsPartSel.class (original) +++ branches/iVL/ClsPartSel.class Thu Jan 22 20:16:44 2009 @@ -19,6 +19,8 @@ STATIC PUBLIC sRoot AS String STATIC PUBLIC fRoot AS String +STATIC PUBLIC sBoot AS String +STATIC PUBLIC fBoot AS String STATIC PUBLIC sHome AS String STATIC PUBLIC fhome AS String STATIC PUBLIC sUsr AS String Modified: branches/iVL/FrmPartSel.class ============================================================================== --- branches/iVL/FrmPartSel.class (original) +++ branches/iVL/FrmPartSel.class Thu Jan 22 20:16:44 2009 @@ -18,6 +18,8 @@ PUBLIC sRootAddr AS String PUBLIC sRootFrmt AS String +PUBLIC sBootAddr AS String +PUBLIC sBootFrmt AS String PUBLIC sHomeAddr AS String PUBLIC sHomeFrmt AS String PUBLIC sUsrAddr AS String @@ -87,7 +89,10 @@ ClsPartSel.fRoot = sRootFrmt RETURN 0 END IF - + IF sBootAddr THEN + ClsPartSel.sBoot = sBootAddr + ClsPartSel.fBoot = sBootFrmt + END IF IF sHomeAddr THEN ClsPartSel.sHome = sHomeAddr ClsPartSel.fhome = sHomeFrmt Modified: branches/iVL/MdlConfLilo.module ============================================================================== --- branches/iVL/MdlConfLilo.module (original) +++ branches/iVL/MdlConfLilo.module Thu Jan 22 20:16:44 2009 @@ -46,6 +46,7 @@ "default = " & FrmLilo.cbDefBoot.Text & "\n" & "compact \n" & "prompt \n" & + "ignore-table \n" & "timeout = " & iTimeout & "\n" & "# \n" & "# Override dangerous defaults that rewrite the partition table: \n" & Modified: branches/iVL/MdlPartSel.module ============================================================================== --- branches/iVL/MdlPartSel.module (original) +++ branches/iVL/MdlPartSel.module Thu Jan 22 20:16:44 2009 @@ -150,6 +150,7 @@ ELSE .Add(("Not Used")) .Add("/") + .Add("/boot") .Add("/home") .Add("/opt") .Add("/usr") @@ -323,6 +324,9 @@ sdropdwn.Text = "reiserfs" END IF NEXT + CASE "/boot" + ClsPartSel.sBoot = LCase(LAST.tag) + CASE "/home" ClsPartSel.sHome = LCase(LAST.tag) @@ -376,6 +380,8 @@ SELECT CASE cb.Text CASE "/" ClsPartSel.fRoot = LAST.text + CASE "/boot" + ClsPartSel.fBoot = LAST.text CASE "/home" ClsPartSel.fhome = LAST.text CASE "/var" @@ -401,6 +407,9 @@ CASE "/" FrmPartSel.sRootAddr = SPartition ClsPartSel.sRoot = SPartition + CASE "/boot" + FrmPartSel.sBootAddr = SPartition + ClsPartSel.sBoot = SPartition CASE "/home" FrmPartSel.sHomeAddr = SPartition ClsPartSel.sHome = SPartition @@ -452,6 +461,9 @@ CASE "/" FrmPartSel.sRootFrmt = sFormat ClsPartSel.fRoot = sFormat + CASE "/boot" + FrmPartSel.sBootFrmt = sFormat + ClsPartSel.fBoot = sFormat CASE "/home" FrmPartSel.sHomeFrmt = sFormat ClsPartSel.fHome = sFormat Modified: branches/iVL/MdlVerifyMedia.module ============================================================================== --- branches/iVL/MdlVerifyMedia.module (original) +++ branches/iVL/MdlVerifyMedia.module Thu Jan 22 20:16:44 2009 @@ -53,21 +53,18 @@ DIM sBulkBasePath AS String = "/mnt/loop/veclinux" FrmMediaCheck.ProgressBar1.Visible = TRUE - sDevice = Right(sEntry, Len(sEntry) - InStr(sEntry, "/") + 1) + EXEC ["mkdir", "-p", "/mnt/source"] WAIT + EXEC ["mkdir", "-p", "/mnt/loop"] WAIT IF InStr(sEntry, ".iso on") THEN ' this is an iso, we must mount the drive and then the ISO 'sDevice = Right(sEntry, Len(sEntry) - InStr(sEntry, "/")) sImage = Left(sEntry, InStr(sEntry, " ")) ' perform the mounting - EXEC ["mkdir", "/mnt/loop"] WAIT - EXEC ["mkdir", "/mnt/source"] WAIT EXEC ["mount", sDevice, "/mnt/source"] WAIT EXEC ["mount", "-o", "loop", "/mnt/source" &/ Trim(sImage), "/mnt/loop"] WAIT ELSE ' Actual CD Media - EXEC ["mkdir", "/mnt/source"] WAIT EXEC ["mount", sDevice, "/mnt/loop"] ' Mount it to loop, just to keep this consistant. - END IF ' Get the list of bulks on this install Modified: branches/iVL/installer.gambas ============================================================================== Binary files. No diff available. |