From: <cod...@go...> - 2007-08-10 14:16:05
|
Author: M0E.lnx Date: Fri Aug 10 07:15:39 2007 New Revision: 18 Modified: trunk/.lang/.pot trunk/.lang/frmConfig.pot trunk/.project trunk/Functions.module trunk/frmConfig.class Log: First lines of the boot manager setup Modified: trunk/.lang/.pot =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/.lang/.pot (original) +++ trunk/.lang/.pot Fri Aug 10 07:15:39 2007 @@ -67,7 +67,7 @@ msgid "Advanced" msgstr "" =20 -#: frmConfig.class:114 +#: frmConfig.class:116 msgid "" "<center><h3><b>Configuration:</b></h3></center>\n" "\n" @@ -101,39 +101,39 @@ "</ul>\n" msgstr "" =20 -#: frmConfig.class:125 +#: frmConfig.class:127 msgid "Additional configuration" msgstr "" =20 -#: frmConfig.class:140 +#: frmConfig.class:142 msgid "Boot manager" msgstr "" =20 -#: frmConfig.class:147 +#: frmConfig.class:149 msgid "Master Boot Record" msgstr "" =20 -#: frmConfig.class:155 +#: frmConfig.class:157 msgid "VL Boot Sector" msgstr "" =20 -#: frmConfig.class:163 +#: frmConfig.class:165 msgid "Floppy diskette" msgstr "" =20 -#: frmConfig.class:171 +#: frmConfig.class:173 msgid "Do not install" msgstr "" =20 -#: frmConfig.class:178 +#: frmConfig.class:180 msgid "Other configuration" msgstr "" =20 -#: frmConfig.class:185 +#: frmConfig.class:187 msgid "Config 1" msgstr "" =20 -#: frmConfig.class:193 +#: frmConfig.class:195 msgid "Config 2" msgstr "" =20 Modified: trunk/.lang/frmConfig.pot =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/.lang/frmConfig.pot (original) +++ trunk/.lang/frmConfig.pot Fri Aug 10 07:15:39 2007 @@ -14,43 +14,43 @@ "Content-Type: text/plain; charset=3DUTF-8\n" "Content-Transfer-Encoding: 8bit\n" =20 -#: frmConfig.class:114 +#: frmConfig.class:116 msgid "<center><h3><b>Configuration:</b></h3></center>\n\n<b><u>Linux Loade= r boot manager setup:</u></b>\n<ul>\n<li><b>Master Boot Record:</b> Install = Linux Loader boot manager to the master Boot Record of the bootable hard dis= k. This is the simplest method and the default action for most common operat= ing systems.</li>\n<li><b>VL Boot sector:</b> Install Linux Loader boot mana= ger to the Boot Sector of the Vector Linux install partition. This will requ= ire the following extra steps:\n<ul>\n<li>make the Vector Linux partition bo= otable using a partition manager.</li>\n<li>add an option to your default bo= ot manager to boot to LiLo in this partition.</li>\n</ul>\n</li>\n<li><b>Flo= ppy diskette:</b> Install Linux Loader boot manager to a floopy diskette in = /dev/fd0 (drive A:). You can then boot to the Vector Linux install by simply= booting the diskette.</li>\n<li><b>Do not install:</b> Do not install Linux= Loader. Select this if you use another boot manager and know how to set up = an option to boot the Vector Linux install from it.</li>\n</ul>\n\n<b><u>Oth= er configuration:</u></b>\n<ul>\n<li><b>Config 1:</b> Other configuration se= lection 1.</li>\n<li><b>Config 2:</b> Other configuration selection 2.</li>\= n</ul>\n" msgstr "" =20 -#: frmConfig.class:125 +#: frmConfig.class:127 msgid "Additional configuration" msgstr "" =20 -#: frmConfig.class:140 +#: frmConfig.class:142 msgid "Boot manager" msgstr "" =20 -#: frmConfig.class:147 +#: frmConfig.class:149 msgid "Master Boot Record" msgstr "" =20 -#: frmConfig.class:155 +#: frmConfig.class:157 msgid "VL Boot Sector" msgstr "" =20 -#: frmConfig.class:163 +#: frmConfig.class:165 msgid "Floppy diskette" msgstr "" =20 -#: frmConfig.class:171 +#: frmConfig.class:173 msgid "Do not install" msgstr "" =20 -#: frmConfig.class:178 +#: frmConfig.class:180 msgid "Other configuration" msgstr "" =20 -#: frmConfig.class:185 +#: frmConfig.class:187 msgid "Config 1" msgstr "" =20 -#: frmConfig.class:193 +#: frmConfig.class:195 msgid "Config 2" msgstr "" =20 Modified: trunk/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/.project (original) +++ trunk/.project Fri Aug 10 07:15:39 2007 @@ -2,9 +2,10 @@ Title=3DVL-gui-installer Startup=3DMain Icon=3Dvl_logo_icon2.png -Version=3D0.0.166 +Version=3D0.0.171 Library=3Dgb.qt Library=3Dgb.qt.ext TabSize=3D3 Translate=3D1 ControlPublic=3D1 +ExecPath=3D/home/moe/Desktop/vl-installer.gambas Modified: trunk/Functions.module =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/Functions.module (original) +++ trunk/Functions.module Fri Aug 10 07:15:39 2007 @@ -323,3 +323,38 @@ ENDIF =20 =20 END + +PUBLIC SUB BootMngrSet() +' This must determine: +' * Where the root partition is +' * Where the kernel is installed +' * where to install lilo (from global.enumLILOMODE ?? ) +' * Which OS's to display in the boot menu (From user input) +' * To use bootsplash or to use framebuffer +' We'll use message.info to display the values for now, we can move those v= alues somewhere else, or dome something more useful with them later + DIM sRoot_Part AS String + DIM sKernel_Loc AS String + DIM ROOT_DIR AS String =3D "/" + DIM Boot_DIR AS String =3D Root_DIR & "boot" + ' Locate the root Partition + IF global.enumLILOMODE =3D 0 THEN=20 + SHELL "cat /etc/fstab | awk '{if ($2 =3D=3D \"/\") {print $1}}'" TO sRoot= _Part + IF NOT sRoot_Part OR sRoot_Part <> "" THEN=20 + SHELL "mount | awk '{if ($3 =3D=3D \"/\") {print $1}}'" TO sRoot_Part + END IF + message.Info("I've identified your root partition as " & gb.newline &= sRoot_Part) + END IF +' Figure out where the kernel is + IF Exist(Boot_DIR & "/vmlinuz") THEN=20 + sKernel_Loc =3D Boot_DIR & "/vmlinuz" + ELSE IF Exist(ROOT_DIR & "/vmlinuz") THEN=20 + sKernel_Loc =3D Root_DIR & "/vmlinuz" + ELSE=20 + Message.Info("I can't find a kernel !!! ") + END IF + IF sKernel_Loc OR sKernel_Loc <> "" THEN=20 + message.Info("I've located the kernel in " & gb.NewLine & sKernel_Loc) + END IF + =20 +END + Modified: trunk/frmConfig.class =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/frmConfig.class (original) +++ trunk/frmConfig.class Fri Aug 10 07:15:39 2007 @@ -25,18 +25,20 @@ PUBLIC SUB btnMBR_Click() 'Master Boot Record: =20 Global.enumLILOMODE =3D 0 +Functions.BootMngrSet =20 END =20 PUBLIC SUB btnBootSec_Click() 'VL Boot Sector: =20 Global.enumLILOMODE =3D 1 - +Functions.BootMngrSet END =20 PUBLIC SUB btnFloppy_Click() 'Floppy diskette: =20 Global.enumLILOMODE =3D 2 +functions.BootMngrSet =20 END =20 |