Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r558 - - New attempt at object-based boot menu.
|
From: <cod...@go...> - 2009-06-08 21:29:16
|
Author: M0...@gm...
Date: Mon Jun 8 14:24:32 2009
New Revision: 558
Added:
branches/speedy/BootMenuEntry.class
Modified:
branches/speedy/.lang/#project.pot
branches/speedy/.lang/.pot
branches/speedy/.lang/ClsFstab.pot
branches/speedy/.lang/ClsGlobal.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/Conf1.pot
branches/speedy/.lang/Conf2.pot
branches/speedy/.lang/Conf3.pot
branches/speedy/.lang/Conf3a.pot
branches/speedy/.lang/Conf4.pot
branches/speedy/.lang/Conf5.pot
branches/speedy/.lang/FDone.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/MdlAutoPartition.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/MdlHelpSystem.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/MdlStartUp.pot
branches/speedy/.lang/Step0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step2.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1.pot
branches/speedy/.lang/Step3a1a.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/Step3a3.pot
branches/speedy/.lang/Step3a3a.pot
branches/speedy/.lang/Step4.pot
branches/speedy/.lang/Step5.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step7.pot
branches/speedy/.lang/Step7a.pot
branches/speedy/.lang/Step7b.pot
branches/speedy/.lang/Step8.pot
branches/speedy/.lang/Step9.pot
branches/speedy/.project
branches/speedy/ClsGlobal.class
branches/speedy/Conf0.class
branches/speedy/MdlBootMngr.module
branches/speedy/MdlMain.module
branches/speedy/Step6.class
branches/speedy/Step8.class
branches/speedy/Step9.class
Log:
- New attempt at object-based boot menu.
- Now populating menu entry based on new objects.
Modified: branches/speedy/.lang/#project.pot
==============================================================================
--- branches/speedy/.lang/#project.pot (original)
+++ branches/speedy/.lang/#project.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/.project
+# /home/moe/devel/speedy/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Mon Jun 8 14:24:32 2009
@@ -38,120 +38,132 @@
msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: Conf0.class:225 MdlBootMngr.module:171
-msgid "Standard"
+#: Conf0.class:258
+msgid "Found on"
msgstr ""
-#: Conf0.class:225
-msgid "Bootplash Med"
+#: Conf0.class:262
+msgid "Label"
msgstr ""
-#: Conf0.class:225 MdlBootMngr.module:175
-msgid "Bootsplash High"
+#: Conf0.class:277
+msgid "Include this operating system in boot menu"
msgstr ""
-#: Conf0.class:225 MdlBootMngr.module:177
-msgid "Bootsplash Extra High"
+#: Conf0.class:281
+msgid "Make this the default operating system to boot"
msgstr ""
-#: Conf0.class:359 Step1.class:434 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:423 Step1.class:434 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:144
msgid "WARNING:"
msgstr ""
-#: Conf0.class:359
+#: Conf0.class:423
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:359
+#: Conf0.class:423
msgid "You may not be able to start your"
msgstr ""
-#: Conf0.class:359
+#: Conf0.class:423
msgid "installation. Do not choose this option"
msgstr ""
-#: Conf0.class:359
+#: Conf0.class:423
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:513
+#: Conf0.class:578
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:521
+#: Conf0.class:586
msgid "Offer"
msgstr ""
-#: Conf0.class:521
+#: Conf0.class:586
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:558
+#: Conf0.class:633
msgid "Title"
msgstr ""
-#: Conf0.class:580
+#: Conf0.class:655
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:636
+#: Conf0.class:711
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:645
+#: Conf0.class:720
msgid "Boot this operating system by default"
msgstr ""
-#: Conf0.class:760
+#: Conf0.class:814
+msgid "Bootsector"
+msgstr ""
+
+#: Conf0.class:816 MdlBootMngr.module:164
+msgid "MBR Of"
+msgstr ""
+
+#: Conf0.class:818 MdlBootMngr.module:170
+msgid "Floppy"
+msgstr ""
+
+#: Conf0.class:872
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:776
+#: Conf0.class:888
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:785
+#: Conf0.class:897
msgid "LILO"
msgstr ""
-#: Conf0.class:792
+#: Conf0.class:904
msgid "GRUB"
msgstr ""
-#: Conf0.class:798
+#: Conf0.class:910
msgid "NONE"
msgstr ""
-#: Conf0.class:807
+#: Conf0.class:919
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:817
+#: Conf0.class:929
msgid "Target"
msgstr ""
-#: Conf0.class:829
+#: Conf0.class:941
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:848
+#: Conf0.class:960
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:859
+#: Conf0.class:971
msgid "Seconds"
msgstr ""
-#: Conf0.class:866
+#: Conf0.class:978
msgid "Boot Default"
msgstr ""
-#: Conf0.class:889
+#: Conf0.class:1001
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:905
+#: Conf0.class:1017
msgid "Tab 0"
msgstr ""
@@ -244,7 +256,7 @@
msgid "When finished, Click"
msgstr ""
-#: Conf3.class:47 MdlMain.module:649 Step3a1a.class:177 Step3a2.class:359
+#: Conf3.class:47 MdlMain.module:652 Step3a1a.class:177 Step3a2.class:359
#: Step3a3a.class:72 Step5.class:177
msgid "to continue"
msgstr ""
@@ -605,45 +617,49 @@
msgid "Select the location to which we will resize"
msgstr ""
-#: MdlBootMngr.module:150
+#: MdlBootMngr.module:152
msgid "None"
msgstr ""
-#: MdlBootMngr.module:161
-msgid "MBR Of"
-msgstr ""
-
-#: MdlBootMngr.module:163
+#: MdlBootMngr.module:166
msgid "Bootsector Of"
msgstr ""
-#: MdlBootMngr.module:165
-msgid "Floppy"
+#: MdlBootMngr.module:176
+msgid "Standard"
msgstr ""
-#: MdlBootMngr.module:173
+#: MdlBootMngr.module:178
msgid "Bootsplash Med"
msgstr ""
-#: MdlBootMngr.module:347
+#: MdlBootMngr.module:180
+msgid "Bootsplash High"
+msgstr ""
+
+#: MdlBootMngr.module:182
+msgid "Bootsplash Extra High"
+msgstr ""
+
+#: MdlBootMngr.module:425
msgid "MBR of"
msgstr ""
-#: MdlBootMngr.module:355
+#: MdlBootMngr.module:433
msgid "Bootsector of"
msgstr ""
-#: MdlBootMngr.module:404
+#: MdlBootMngr.module:482
msgid "You must select one operating system to be started by default"
msgstr ""
-#: MdlBootMngr.module:422
+#: MdlBootMngr.module:500
msgid ""
"Found duplicate operating system names. Please use unique labels for
each "
"menu entry"
msgstr ""
-#: MdlBootMngr.module:425
+#: MdlBootMngr.module:503
msgid "Check these boxes to make sure they have unique names"
msgstr ""
@@ -679,47 +695,47 @@
msgid "Error during installation of required software. Unable to continue"
msgstr ""
-#: MdlMain.module:618
+#: MdlMain.module:621
msgid "Unable to install contents of"
msgstr ""
-#: MdlMain.module:618
+#: MdlMain.module:621
msgid "Cannot continue"
msgstr ""
-#: MdlMain.module:649
+#: MdlMain.module:652
msgid "Installation is complete. Click"
msgstr ""
-#: MdlMain.module:651
+#: MdlMain.module:654
msgid "Installation complete... Click"
msgstr ""
-#: MdlMain.module:651
+#: MdlMain.module:654
msgid "to continue."
msgstr ""
-#: MdlMain.module:653
+#: MdlMain.module:656
msgid "Error while installing kernels and initrds"
msgstr ""
-#: MdlMain.module:676
+#: MdlMain.module:679
msgid "Unable to install the components of"
msgstr ""
-#: MdlMain.module:676
+#: MdlMain.module:679
msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:765
+#: MdlMain.module:768
msgid "Installing"
msgstr ""
-#: MdlMain.module:765
+#: MdlMain.module:768
msgid "Part of"
msgstr ""
-#: MdlMain.module:768
+#: MdlMain.module:771
msgid "Error installing"
msgstr ""
@@ -739,7 +755,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:147
+#: MdlStartUp.module:47 Step8.class:150
msgid "Software Selection"
msgstr ""
@@ -747,7 +763,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:230
+#: MdlStartUp.module:49 Step8.class:233
msgid "Installation Summary"
msgstr ""
@@ -1182,11 +1198,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:510 Step7a.class:144
+#: Step3a1a.class:186 Step6.class:518 Step7a.class:144
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:510 Step7a.class:144
+#: Step3a1a.class:186 Step6.class:518 Step7a.class:144
msgid "No"
msgstr ""
@@ -1463,7 +1479,7 @@
msgid "Not Used"
msgstr ""
-#: Step6.class:190 Step8.class:82
+#: Step6.class:190 Step8.class:85
msgid "Do not format"
msgstr ""
@@ -1483,7 +1499,7 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:405
+#: Step6.class:413
msgid "Select which partitions to use for installation"
msgstr ""
@@ -1499,7 +1515,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:164 Step8.class:137
+#: Step7.class:164 Step8.class:140
msgid "Customized"
msgstr ""
@@ -1507,7 +1523,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:182 Step8.class:139
+#: Step7.class:182 Step8.class:142
msgid "Minimal"
msgstr ""
@@ -1583,51 +1599,51 @@
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:83
+#: Step8.class:86
msgid "Not Formatted"
msgstr ""
-#: Step8.class:83
+#: Step8.class:86
msgid "Mount to"
msgstr ""
-#: Step8.class:84
+#: Step8.class:87
msgid "Format to"
msgstr ""
-#: Step8.class:84
+#: Step8.class:87
msgid "and mount to"
msgstr ""
-#: Step8.class:100
+#: Step8.class:103
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:105
+#: Step8.class:108
msgid "Swap Space"
msgstr ""
-#: Step8.class:118
+#: Step8.class:121
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:135
+#: Step8.class:138
msgid "Full"
msgstr ""
-#: Step8.class:142
+#: Step8.class:145
msgid "Installation Method"
msgstr ""
-#: Step8.class:148
+#: Step8.class:151
msgid "Major Components"
msgstr ""
-#: Step8.class:158
+#: Step8.class:161
msgid "Additional Software"
msgstr ""
-#: Step8.class:249
+#: Step8.class:252
msgid ""
"Your VectorLinux installation is about to be performed as follows. If
you "
"need to make any changes, this is your last chance."
@@ -1637,34 +1653,34 @@
msgid "is being installed to your computer. Please wait."
msgstr ""
-#: Step9.class:91
+#: Step9.class:121
msgid "Prepare Partitions"
msgstr ""
-#: Step9.class:91
+#: Step9.class:121
msgid "Install Base System (required)"
msgstr ""
-#: Step9.class:91
+#: Step9.class:121
msgid "Install User-Selected Software"
msgstr ""
-#: Step9.class:156
+#: Step9.class:186
msgid "Starting installation process"
msgstr ""
-#: Step9.class:163
+#: Step9.class:193
msgid "Something went wrong during installation. Please try again"
msgstr ""
-#: Step9.class:212
+#: Step9.class:242
msgid "Installation in progress"
msgstr ""
-#: Step9.class:294
+#: Step9.class:324
msgid "Install Process"
msgstr ""
-#: Step9.class:310
+#: Step9.class:340
msgid "The development Crew"
msgstr ""
Modified: branches/speedy/.lang/ClsFstab.pot
==============================================================================
--- branches/speedy/.lang/ClsFstab.pot (original)
+++ branches/speedy/.lang/ClsFstab.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/ClsFstab.class
+# /home/moe/devel/speedy/ClsFstab.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/ClsGlobal.pot
==============================================================================
--- branches/speedy/.lang/ClsGlobal.pot (original)
+++ branches/speedy/.lang/ClsGlobal.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/ClsGlobal.class
+# /home/moe/devel/speedy/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Conf0.class
+# /home/moe/devel/speedy/Conf0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -38,119 +38,131 @@
msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: Conf0.class:225
-msgid "Standard"
+#: Conf0.class:258
+msgid "Found on"
msgstr ""
-#: Conf0.class:225
-msgid "Bootplash Med"
+#: Conf0.class:262
+msgid "Label"
msgstr ""
-#: Conf0.class:225
-msgid "Bootsplash High"
+#: Conf0.class:277
+msgid "Include this operating system in boot menu"
msgstr ""
-#: Conf0.class:225
-msgid "Bootsplash Extra High"
+#: Conf0.class:281
+msgid "Make this the default operating system to boot"
msgstr ""
-#: Conf0.class:359
+#: Conf0.class:423
msgid "WARNING:"
msgstr ""
-#: Conf0.class:359
+#: Conf0.class:423
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:359
+#: Conf0.class:423
msgid "You may not be able to start your"
msgstr ""
-#: Conf0.class:359
+#: Conf0.class:423
msgid "installation. Do not choose this option"
msgstr ""
-#: Conf0.class:359
+#: Conf0.class:423
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:513
+#: Conf0.class:578
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:521
+#: Conf0.class:586
msgid "Offer"
msgstr ""
-#: Conf0.class:521
+#: Conf0.class:586
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:558
+#: Conf0.class:633
msgid "Title"
msgstr ""
-#: Conf0.class:580
+#: Conf0.class:655
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:636
+#: Conf0.class:711
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:645
+#: Conf0.class:720
msgid "Boot this operating system by default"
msgstr ""
-#: Conf0.class:760
+#: Conf0.class:814
+msgid "Bootsector"
+msgstr ""
+
+#: Conf0.class:816
+msgid "MBR Of"
+msgstr ""
+
+#: Conf0.class:818
+msgid "Floppy"
+msgstr ""
+
+#: Conf0.class:872
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:776
+#: Conf0.class:888
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:785
+#: Conf0.class:897
msgid "LILO"
msgstr ""
-#: Conf0.class:792
+#: Conf0.class:904
msgid "GRUB"
msgstr ""
-#: Conf0.class:798
+#: Conf0.class:910
msgid "NONE"
msgstr ""
-#: Conf0.class:807
+#: Conf0.class:919
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:817
+#: Conf0.class:929
msgid "Target"
msgstr ""
-#: Conf0.class:829
+#: Conf0.class:941
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:848
+#: Conf0.class:960
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:859
+#: Conf0.class:971
msgid "Seconds"
msgstr ""
-#: Conf0.class:866
+#: Conf0.class:978
msgid "Boot Default"
msgstr ""
-#: Conf0.class:889
+#: Conf0.class:1001
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:905
+#: Conf0.class:1017
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/Conf1.pot
==============================================================================
--- branches/speedy/.lang/Conf1.pot (original)
+++ branches/speedy/.lang/Conf1.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Conf1.class
+# /home/moe/devel/speedy/Conf1.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Conf2.pot
==============================================================================
--- branches/speedy/.lang/Conf2.pot (original)
+++ branches/speedy/.lang/Conf2.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Conf2.class
+# /home/moe/devel/speedy/Conf2.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Conf3.pot
==============================================================================
--- branches/speedy/.lang/Conf3.pot (original)
+++ branches/speedy/.lang/Conf3.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Conf3.class
+# /home/moe/devel/speedy/Conf3.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Conf3a.pot
==============================================================================
--- branches/speedy/.lang/Conf3a.pot (original)
+++ branches/speedy/.lang/Conf3a.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Conf3a.class
+# /home/moe/devel/speedy/Conf3a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Conf4.pot
==============================================================================
--- branches/speedy/.lang/Conf4.pot (original)
+++ branches/speedy/.lang/Conf4.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Conf4.class
+# /home/moe/devel/speedy/Conf4.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Conf5.pot
==============================================================================
--- branches/speedy/.lang/Conf5.pot (original)
+++ branches/speedy/.lang/Conf5.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Conf5.class
+# /home/moe/devel/speedy/Conf5.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/FDone.pot
==============================================================================
--- branches/speedy/.lang/FDone.pot (original)
+++ branches/speedy/.lang/FDone.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/FDone.class
+# /home/moe/devel/speedy/FDone.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/FMain.class
+# /home/moe/devel/speedy/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/FMain0.class
+# /home/moe/devel/speedy/FMain0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlAutoPartition.pot
==============================================================================
--- branches/speedy/.lang/MdlAutoPartition.pot (original)
+++ branches/speedy/.lang/MdlAutoPartition.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlAutoPartition.module
+# /home/moe/devel/speedy/MdlAutoPartition.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlBootMngr.module
+# /home/moe/devel/speedy/MdlBootMngr.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,55 +14,55 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlBootMngr.module:150
+#: MdlBootMngr.module:152
msgid "None"
msgstr ""
-#: MdlBootMngr.module:161
+#: MdlBootMngr.module:164
msgid "MBR Of"
msgstr ""
-#: MdlBootMngr.module:163
+#: MdlBootMngr.module:166
msgid "Bootsector Of"
msgstr ""
-#: MdlBootMngr.module:165
+#: MdlBootMngr.module:170
msgid "Floppy"
msgstr ""
-#: MdlBootMngr.module:171
+#: MdlBootMngr.module:176
msgid "Standard"
msgstr ""
-#: MdlBootMngr.module:173
+#: MdlBootMngr.module:178
msgid "Bootsplash Med"
msgstr ""
-#: MdlBootMngr.module:175
+#: MdlBootMngr.module:180
msgid "Bootsplash High"
msgstr ""
-#: MdlBootMngr.module:177
+#: MdlBootMngr.module:182
msgid "Bootsplash Extra High"
msgstr ""
-#: MdlBootMngr.module:347
+#: MdlBootMngr.module:425
msgid "MBR of"
msgstr ""
-#: MdlBootMngr.module:355
+#: MdlBootMngr.module:433
msgid "Bootsector of"
msgstr ""
-#: MdlBootMngr.module:404
+#: MdlBootMngr.module:482
msgid "You must select one operating system to be started by default"
msgstr ""
-#: MdlBootMngr.module:422
+#: MdlBootMngr.module:500
msgid "Found duplicate operating system names. Please use unique labels
for each menu entry"
msgstr ""
-#: MdlBootMngr.module:425
+#: MdlBootMngr.module:503
msgid "Check these boxes to make sure they have unique names"
msgstr ""
Modified: branches/speedy/.lang/MdlHelpSystem.pot
==============================================================================
--- branches/speedy/.lang/MdlHelpSystem.pot (original)
+++ branches/speedy/.lang/MdlHelpSystem.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlHelpSystem.module
+# /home/moe/devel/speedy/MdlHelpSystem.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlMain.module
+# /home/moe/devel/speedy/MdlMain.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -46,51 +46,51 @@
msgid "Error during installation of required software. Unable to continue"
msgstr ""
-#: MdlMain.module:618
+#: MdlMain.module:621
msgid "Unable to install contents of"
msgstr ""
-#: MdlMain.module:618
+#: MdlMain.module:621
msgid "Cannot continue"
msgstr ""
-#: MdlMain.module:649
+#: MdlMain.module:652
msgid "Installation is complete. Click"
msgstr ""
-#: MdlMain.module:649
+#: MdlMain.module:652
msgid "to continue"
msgstr ""
-#: MdlMain.module:651
+#: MdlMain.module:654
msgid "Installation complete... Click"
msgstr ""
-#: MdlMain.module:651
+#: MdlMain.module:654
msgid "to continue."
msgstr ""
-#: MdlMain.module:653
+#: MdlMain.module:656
msgid "Error while installing kernels and initrds"
msgstr ""
-#: MdlMain.module:676
+#: MdlMain.module:679
msgid "Unable to install the components of"
msgstr ""
-#: MdlMain.module:676
+#: MdlMain.module:679
msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:765
+#: MdlMain.module:768
msgid "Installing"
msgstr ""
-#: MdlMain.module:765
+#: MdlMain.module:768
msgid "Part of"
msgstr ""
-#: MdlMain.module:768
+#: MdlMain.module:771
msgid "Error installing"
msgstr ""
Modified: branches/speedy/.lang/MdlStartUp.pot
==============================================================================
--- branches/speedy/.lang/MdlStartUp.pot (original)
+++ branches/speedy/.lang/MdlStartUp.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlStartUp.module
+# /home/moe/devel/speedy/MdlStartUp.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step0.pot
==============================================================================
--- branches/speedy/.lang/Step0.pot (original)
+++ branches/speedy/.lang/Step0.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step0.class
+# /home/moe/devel/speedy/Step0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step1.class
+# /home/moe/devel/speedy/Step1.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step2.pot
==============================================================================
--- branches/speedy/.lang/Step2.pot (original)
+++ branches/speedy/.lang/Step2.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step2.class
+# /home/moe/devel/speedy/Step2.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3.class
+# /home/moe/devel/speedy/Step3.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a.class
+# /home/moe/devel/speedy/Step3a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- branches/speedy/.lang/Step3a1.pot (original)
+++ branches/speedy/.lang/Step3a1.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a1.class
+# /home/moe/devel/speedy/Step3a1.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- branches/speedy/.lang/Step3a1a.pot (original)
+++ branches/speedy/.lang/Step3a1a.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a1a.class
+# /home/moe/devel/speedy/Step3a1a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a2.class
+# /home/moe/devel/speedy/Step3a2.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a3.pot
==============================================================================
--- branches/speedy/.lang/Step3a3.pot (original)
+++ branches/speedy/.lang/Step3a3.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a3.class
+# /home/moe/devel/speedy/Step3a3.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a3a.pot (original)
+++ branches/speedy/.lang/Step3a3a.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a3a.class
+# /home/moe/devel/speedy/Step3a3a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step4.pot
==============================================================================
--- branches/speedy/.lang/Step4.pot (original)
+++ branches/speedy/.lang/Step4.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step4.class
+# /home/moe/devel/speedy/Step4.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step5.class
+# /home/moe/devel/speedy/Step5.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step6.class
+# /home/moe/devel/speedy/Step6.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -58,15 +58,15 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:405
+#: Step6.class:413
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:510
+#: Step6.class:518
msgid "Yes"
msgstr ""
-#: Step6.class:510
+#: Step6.class:518
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step7.pot
==============================================================================
--- branches/speedy/.lang/Step7.pot (original)
+++ branches/speedy/.lang/Step7.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step7.class
+# /home/moe/devel/speedy/Step7.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7a.pot
==============================================================================
--- branches/speedy/.lang/Step7a.pot (original)
+++ branches/speedy/.lang/Step7a.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step7a.class
+# /home/moe/devel/speedy/Step7a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7b.pot
==============================================================================
--- branches/speedy/.lang/Step7b.pot (original)
+++ branches/speedy/.lang/Step7b.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step7b.class
+# /home/moe/devel/speedy/Step7b.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step8.class
+# /home/moe/devel/speedy/Step8.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -22,71 +22,71 @@
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:82
+#: Step8.class:85
msgid "Do not format"
msgstr ""
-#: Step8.class:83
+#: Step8.class:86
msgid "Not Formatted"
msgstr ""
-#: Step8.class:83
+#: Step8.class:86
msgid "Mount to"
msgstr ""
-#: Step8.class:84
+#: Step8.class:87
msgid "Format to"
msgstr ""
-#: Step8.class:84
+#: Step8.class:87
msgid "and mount to"
msgstr ""
-#: Step8.class:100
+#: Step8.class:103
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:105
+#: Step8.class:108
msgid "Swap Space"
msgstr ""
-#: Step8.class:118
+#: Step8.class:121
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:135
+#: Step8.class:138
msgid "Full"
msgstr ""
-#: Step8.class:137
+#: Step8.class:140
msgid "Customized"
msgstr ""
-#: Step8.class:139
+#: Step8.class:142
msgid "Minimal"
msgstr ""
-#: Step8.class:142
+#: Step8.class:145
msgid "Installation Method"
msgstr ""
-#: Step8.class:147
+#: Step8.class:150
msgid "Software Selection"
msgstr ""
-#: Step8.class:148
+#: Step8.class:151
msgid "Major Components"
msgstr ""
-#: Step8.class:158
+#: Step8.class:161
msgid "Additional Software"
msgstr ""
-#: Step8.class:230
+#: Step8.class:233
msgid "Installation Summary"
msgstr ""
-#: Step8.class:249
+#: Step8.class:252
msgid "Your VectorLinux installation is about to be performed as follows.
If you need to make any changes, this is your last chance."
msgstr ""
Modified: branches/speedy/.lang/Step9.pot
==============================================================================
--- branches/speedy/.lang/Step9.pot (original)
+++ branches/speedy/.lang/Step9.pot Mon Jun 8 14:24:32 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step9.class
+# /home/moe/devel/speedy/Step9.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -18,35 +18,35 @@
msgid "is being installed to your computer. Please wait."
msgstr ""
-#: Step9.class:91
+#: Step9.class:121
msgid "Prepare Partitions"
msgstr ""
-#: Step9.class:91
+#: Step9.class:121
msgid "Install Base System (required)"
msgstr ""
-#: Step9.class:91
+#: Step9.class:121
msgid "Install User-Selected Software"
msgstr ""
-#: Step9.class:156
+#: Step9.class:186
msgid "Starting installation process"
msgstr ""
-#: Step9.class:163
+#: Step9.class:193
msgid "Something went wrong during installation. Please try again"
msgstr ""
-#: Step9.class:212
+#: Step9.class:242
msgid "Installation in progress"
msgstr ""
-#: Step9.class:294
+#: Step9.class:324
msgid "Install Process"
msgstr ""
-#: Step9.class:310
+#: Step9.class:340
msgid "The development Crew"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Mon Jun 8 14:24:32 2009
@@ -1,5 +1,5 @@
# Gambas Project File 2.0
-# Compiled with Gambas 2.12
+# Compiled with Gambas 2.13.1
Title=VectorLinux Installer
Startup=MdlStartUp
Version=0.0.9
Added: branches/speedy/BootMenuEntry.class
==============================================================================
--- (empty file)
+++ branches/speedy/BootMenuEntry.class Mon Jun 8 14:24:32 2009
@@ -0,0 +1,161 @@
+' Gambas class file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PROPERTY Label AS String
+PROPERTY Root AS String
+PROPERTY initrd AS String
+PROPERTY kernel AS String
+PROPERTY StartupOptions AS String
+PROPERTY Enabled AS Boolean
+PROPERTY IsDefault AS Boolean
+PROPERTY sLIloLabel AS String
+PROPERTY sGrubLabel AS String
+PROPERTY osType AS String
+
+
+PRIVATE $Label AS String
+PRIVATE $Root AS String
+PRIVATE $initrd AS String
+PRIVATE $kernel AS String
+PRIVATE $StartupOptions AS String
+PRIVATE $Enabled AS Boolean
+PRIVATE $IsDefault AS Boolean
+PRIVATE $sLiloLabel AS String
+PRIVATE $sGrubLabel AS String
+PRIVATE $type AS String
+
+
+
+PRIVATE FUNCTION Label_Read() AS String
+
+ RETURN $Label
+
+END
+
+PRIVATE SUB Label_Write(Value AS String)
+
+ $Label = Value
+
+END
+
+PRIVATE FUNCTION Root_Read() AS String
+
+ RETURN $Root
+
+END
+
+PRIVATE SUB Root_Write(Value AS String)
+
+ $Root = Value
+
+END
+
+PRIVATE FUNCTION kernel_Read() AS String
+
+ RETURN $kernel
+
+END
+
+PRIVATE SUB kernel_Write(Value AS String)
+
+ $kernel = Value
+
+END
+
+PRIVATE FUNCTION initrd_Read() AS String
+
+RETURN $initrd
+
+END
+
+PRIVATE SUB initrd_Write(Value AS String)
+
+$initrd = Value
+
+END
+
+PRIVATE FUNCTION StartupOptions_Read() AS String
+
+ RETURN $StartupOptions
+
+END
+
+PRIVATE SUB StartupOptions_Write(Value AS String)
+
+ $StartupOptions = Value
+
+END
+
+PRIVATE FUNCTION Enabled_Read() AS Boolean
+
+ RETURN $Enabled
+
+END
+
+PRIVATE SUB Enabled_Write(Value AS Boolean)
+
+ $Enabled = Value
+
+END
+
+PRIVATE FUNCTION IsDefault_Read() AS Boolean
+
+ RETURN $IsDefault
+
+END
+
+PRIVATE SUB IsDefault_Write(Value AS Boolean)
+
+ $IsDefault = Value
+
+END
+
+PRIVATE FUNCTION sLIloLabel_Read() AS String
+
+ RETURN $sLiloLabel
+
+END
+
+PRIVATE SUB sLIloLabel_Write(Value AS String)
+
+ $sLiloLabel = Value
+
+END
+
+PRIVATE FUNCTION sGrubLabel_Read() AS String
+
+ RETURN $sGrubLabel
+
+END
+
+PRIVATE SUB sGrubLabel_Write(Value AS String)
+
+ $sGrubLabel = Value
+
+END
+
+PRIVATE FUNCTION osType_Read() AS String
+
+ RETURN $type
+
+END
+
+PRIVATE SUB osType_Write(Value AS String)
+
+ $type = Value
+
+END
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Mon Jun 8 14:24:32 2009
@@ -76,3 +76,5 @@
STATIC PUBLIC sInstallType AS String ' type of installation to be done
(Full, Custom, Minimal)
STATIC PUBLIC objMinComponents AS NEW Object[]
+STATIC PUBLIC BootMngrTarget AS String
+
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Mon Jun 8 14:24:32 2009
@@ -218,29 +218,93 @@
END
-PUBLIC SUB Form_Open()
+' PUBLIC SUB Form_Open()
+'
+' WITH ME
+' .tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
+' .cbVidRes.List = [("Standard"), ("Bootplash Med"), ("Bootsplash
High"), ("Bootsplash Extra High")]
+' .TLoSlIST.Text = "<b>" & UCase(.TLoSlIST.Text) & "</b>"
+' END WITH
+' 'ME.Fake_Names()
+' 'ME.List_Other_Linuxes(ME.TsOsList)
+' 'ME.Update_Default_boot_choices()
+' ' Write /etc/vector-version
+' MdlMain.WRITE_ETC_VECTOR_VERSION()
+'
+' MdlBootMngr.Display_Bootmanager_Target_Options(ME.cbTarget)
+' ME.PROBE_SYSTEM_FOR_OS("lilo")
+'
+' ME.Timer1.Enabled = TRUE
+'
+' ' Update status tree
+' MdlMain.ADVANCE_STATUS_TREE("Step5", "Step6")
+'
+' END
- WITH ME
- .tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
- .cbVidRes.List = [("Standard"), ("Bootplash Med"), ("Bootsplash
High"), ("Bootsplash Extra High")]
- .TLoSlIST.Text = "<b>" & UCase(.TLoSlIST.Text) & "</b>"
- END WITH
-'ME.Fake_Names()
- 'ME.List_Other_Linuxes(ME.TsOsList)
- 'ME.Update_Default_boot_choices()
- ' Write /etc/vector-version
- MdlMain.WRITE_ETC_VECTOR_VERSION()
+PUBLIC SUB POPULATE_MENU_TABSTRIP()
+
+ DIM entry AS BootMenuEntry
+ DIM i AS Integer
+ DIM tl AS TextLabel
+ DIM tb AS TextBox
+ DIM chk AS CheckBox
+ DIM cb AS ComboBox
- MdlBootMngr.Display_Bootmanager_Target_Options(ME.cbTarget)
- ME.PROBE_SYSTEM_FOR_OS("lilo")
- ME.Timer1.Enabled = TRUE
+ FOR EACH entry IN MdlBootMngr.objMenuEntries
+ ME.TsOsList.Index = ME.TsOsList.Count - 1
+ TsOsList.Text = entry.Root
+ tl = NEW TextLabel(TsOsList)
+ tl.Text = entry.sLIloLabel & Space(1) & ("Found on") & Space(1) &
entry.Root
+ tl.Height = 24
+ tl.Expand = TRUE
+ tl = NEW TextLabel(ME.TsOsList)
+ tl.Text = ("Label")
+ tl.Height = 24
+ tl.Width = 100
+ tl.Expand = FALSE
+ tl.Alignment = Align.Left
+
+ tb = NEW TextBox(ME.TsOsList) AS "NameBox"
+ tb.Height = 24
+ tb.Expand = TRUE
+ tb.Text = entry.sLIloLabel
+
+ chk = NEW CheckBox(ME.TsOsList) AS "IncludeBox"
+ chk.Height = 24
+ chk.Value = entry.Enabled
+ chk.Expand = TRUE
+ chk.Text = ("Include this operating system in boot menu")
+
+ chk = NEW CheckBox(ME.TsOsList) AS "DefOs"
+ chk.Expand = TRUE
+ chk.Text = ("Make this the default operating system to boot")
+ chk.Value = entry.IsDefault
+ chk.Height = 24
+
+
+
+ INC ME.TsOsList.Count
+
+ NEXT
+ TRY DEC ME.TsOsList.Count
+
+
+
- ' Update status tree
- MdlMain.ADVANCE_STATUS_TREE("Step5", "Step6")
+END
+
+PUBLIC SUB Form_Open()
+ DIM ent AS BootMenuEntry
+ 'MdlBootMngr.CREATE_MENU_ENTRY_OBJECTS()
+ FOR EACH ent IN MdlBootMngr.objMenuEntries
+ PRINT ent.sGrubLabel & " on " & ent.Root
+ NEXT
+ ME.POPULATE_MENU_TABSTRIP()
END
+
PUBLIC FUNCTION GetNext() AS String
RETURN "Conf1"
@@ -479,8 +543,9 @@
DIM sOsList, sOsLine, sBootLine, sDumparr AS String[]
DIM sKernel, sInitrd, sAppendLine AS String
DIM sBootargs AS String
+ DIM entry AS BootMenuEntry
- SHELL "/bin/os-prober > /tmp/os.lst"
+ SHELL "/bin/os-prober > /tmp/os.lst" WAIT
sOsList = Split(Trim(File.Load("/tmp/os.lst")), gb.NewLine)
FOR i = 0 TO sOsList.Max
@@ -527,6 +592,16 @@
END IF
TsOsList.Current.Text = sRoot
Populate_linux_tab(sRoot, sTitle, sKernel, sInitrd,
sAppendLine, sBootManager)
+ ' create object for global configuration
+ entry = NEW BootMenuEntry
+ entry.Enabled = TRUE
+ entry.Root = sRoot
+ entry.Label = sTitle
+ entry.kernel = skernel
+ entry.initrd = sInitrd
+ entry.StartupOptions = sAppendLine
+
+ MdlBootMngr.objMenuEntries.Add(entry) ' add this to the
global variable
INC TsOsList.Count
END IF
@@ -654,6 +729,7 @@
DIM cb AS CheckBox
DIM tb AS TextBox
+ DIM entry AS BootMenuEntry
IF objDefOs.Count > 1 THEN
FOR EACH cb IN objDefOs
@@ -677,9 +753,25 @@
END IF
NEXT
END IF
+
+ FOR EACH entry IN MdlBootMngr.objMenuEntries
+ entry.IsDefault = FALSE
+ NEXT
-
-
+ IF LAST.value = TRUE THEN
+ FOR EACH entry IN MdlBootMngr.objMenuEntries
+ IF entry.root = LAST.tag THEN
+ entry.IsDefault = TRUE
+ ELSE
+ entry.IsDefault = FALSE
+ END IF
+ NEXT
+ ELSE
+ FOR EACH entry IN MdlBootMngr.objMenuEntries
+ IF entry.root = LAST.tag THEN entry.IsDefault = FALSE
+ NEXT
+ END IF
+
END
@@ -692,6 +784,7 @@
PUBLIC SUB OsNameBox_KeyRelease()
DIM cb AS CheckBox
+ DIM menu AS BootMenuEntry
FOR EACH cb IN objDefOs
IF cb.Value = TRUE THEN
IF cb.Tag = LAST.tag THEN ' we are modifying the default OS value
@@ -699,7 +792,11 @@
END IF
END IF
NEXT
-
+ FOR EACH menu IN MdlBootMngr.objMenuEntries
+ IF menu.Root = LAST.tag THEN
+ menu.Label = LAST.text
+ END IF
+ NEXT
END
@@ -710,3 +807,18 @@
'PRINT MdlBootMngr.CHECK_LILO_VALUES(TRUE)
END
+
+PUBLIC SUB cbTarget_Click()
+
+ 'ClsGlobal.BootMngrTarget = Trim(LAST.text)
+ IF InStr(LAST.text, ("Bootsector")) THEN
+ ClsGlobal.BootMngrTarget = Right(Trim(LAST.text), Len("/dev/sda1"))
+ ELSE IF InStr(LAST.text, ("MBR Of")) THEN
+ ClsGlobal.BootMngrTarget = Right(Trim(LAST.text), Len("/dev/sda"))
+ ELSE IF InStr(LAST.text, ("Floppy")) THEN
+ ClsGlobal.BootMngrTarget = "/dev/fd0"
+ END IF
+
+END
+
+
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Mon Jun 8 14:24:32 2009
@@ -20,7 +20,9 @@
' PUBLIC objChecks AS Object[]
' PUBLIC objappends AS Object[]
' PUBLIC objNames AS Object[]
+PRIVATE $chroot AS Process
PUBLIC bScanned AS Boolean
+PUBLIC objMenuEntries AS NEW Object[]
PUBLIC FUNCTION ID_LINUX(sMountedLocation AS String) AS String
DIM sRes AS String
@@ -156,12 +158,15 @@
DIM sTmp AS String
DIM sTarget, sVidMod, sDefBoot, sVGA, sVidImput, sVidText, sOutput AS
String
DIM iTimeOut AS Integer
+ DIM sOsList AS String
- sTarget = Trim(Conf0.cbTarget.Text)
+ sTarget = Trim(ClsGlobal.BootMngrTarget)
IF InStr(sTarget, ("MBR Of")) THEN
sTarget = Right(sTarget, Len(sTarget) - InStr(sTarget, "/") + 1)
ELSE IF sTarget = ("Bootsector Of") & Space(1) & ClsGlobal.sRoot THEN
- sTarget = ClsGlobal.sRoot
+ 'sTarget = ClsGlobal.sRoot
+ sTarget = Right(Trim(sTarget), Len("/dev/sda1"))
+ 'Message.Info(sTarget)
ELSE IF sTarget = ("Floppy") THEN
sTarget = "/dev/df0"
END IF
@@ -200,9 +205,9 @@
"#vga = 784 \n" &
"#VESA framebuffer console @ 640 x480x256 \n" &
"#vga = 769 \n" &
-"# Begin listing OS Choices \n"
+"# Begin listing OS Choices \n" & gb.NewLine
-
+ sOsList = ME.get_Final_OS_list_for_lilo()
sDefBoot = ClsGlobal.sDefBoot
iTimeOut = Conf0.SbTimeOut.Value * 10
@@ -220,7 +225,9 @@
"reset \n" &
"bitmap = /boot/bitmap/boot.bmp \n" &
"#\n\n" &
- sVidText
+ sVidText & gb.NewLine & sOsList & gb.NewLine
+
+
File.Save(Temp("lilo.in"), sOutput)
@@ -228,6 +235,60 @@
END
+PUBLIC FUNCTION get_Final_OS_list_for_lilo() AS String
+
+ DIM sOutput AS String
+ DIM cb AS CheckBox
+ DIM tb AS TextBox
+ DIM comb AS ComboBox
+ DIM tl AS TextLabel
+ DIM ThisEntry AS String
+ DIM entry AS BootMenuEntry
+ DIM Entries AS NEW Object[]
+
+ FOR EACH cb IN Conf0.objMenuObjects
+ entry = NEW BootMenuEntry
+ entry.Enabled = cb.Value
+ entry.Root = cb.Tag
+ FOR EACH tl IN Conf0.objNames
+ IF tl.Name = cb.Tag THEN entry.kernel = tl.tag
+ NEXT
+ FOR EACH comb IN Conf0.objinitrds
+ IF comb.Tag = cb.Tag THEN entry.initrd = comb.Text
+ NEXT
+ FOR EACH tb IN Conf0.objappends
+ IF tb.tag = cb.tag THEN entry.StartupOptions = tb.Text
+ NEXT
+ Entries.Add(entry)
+ NEXT
+
+ ' generate the list
+ FOR EACH entry IN Entries
+ IF entry.Enabled = TRUE THEN
+ ThisEntry = "# Menu entry for " & entry.Label & "\n" &
+ "image = " & entry.kernel & "\n" &
+ "root = " & entry.Root & "\n" &
+ "label = " & entry.Label & "\n" &
+ "initrd = " & entry.initrd & "\n" &
+ "append = " & entry.StartupOptions & "\n" &
+ "read-only" & gb.NewLine
+ sOutput = sOutput & ThisEntry
+ END IF
+ NEXT
+
+ RETURN sOutput
+
+
+
+
+
+
+
+
+END
+
+
+
PUBLIC SUB SETUP_LILO_BOOT_MANAGER()
DIM cbx AS CheckBox
@@ -272,11 +333,28 @@
EXEC ["mount", "-o", "bind", "/dev", ClsGlobal.sTargetPath &/ "dev"] WAIT
' now, we need to run the lilo command itself
- SHELL "chroot " & ClsGlobal.sTargetPath & " && /sbin/depmod -aq &&
lilo " WAIT
+ DEBUG "Chroot into target, load modules and execute lilo"
+ 'SHELL "chroot " & ClsGlobal.sTargetPath & "; sleep 1; echo \' Done
chrooting\'; /sbin/depmod -aq ; lilo " WAIT
+ DEBUG "Opening chroot shell for lilo setup."
+ $chroot = SHELL "chroot " & ClsGlobal.sTargetPath FOR READ WRITE
+
+ 'PRINT #$chroot, "echo \"test\""
+ PRINT #$chroot, "/sbin/depmod -aq"
+ PRINT #$chroot, "/sbin/lilo -v"
+ PRINT #$chroot, "echo \"Done\""
+
+END
+
+PUBLIC SUB Process_Read()
+
+ DIM sLine AS String
+ READ #LAST, sLine, -256
+ PRINT sLine
END
+
PUBLIC SUB GENERATE_LILO_OS_LIST()
DIM ckb AS CheckBox
@@ -433,3 +511,43 @@
RETURN 0
END
+
+PUBLIC SUB CREATE_MENU_ENTRY_OBJECTS()
+
+ DIM sRawList, sRawEntry, sRawLine, sOptions AS String[]
+
+ DIM sDump AS String
+ DIM i, ii AS Integer
+ DIM entry AS BootMenuEntry
+
+
+ SHELL "/bin/os-prober" TO sDump
+ sDump = Trim(sDump)
+ sRawList = Split(sDump, gb.NewLine)
+
+ FOR i = 0 TO sRawList.Max
+ sRawLine = Split(Trim(sRawList[i]), ":")
+ IF NOT (sRawLine) THEN CONTINUE
+ entry = NEW BootMenuEntry
+ entry.Root = sRawLine[0]
+ entry.sLIloLabel = sRawLine[2]
+ entry.sGrubLabel = sRawLine[1]
+ entry.osType = sRawEntry[3]
+ entry.Label = entry.sLIloLabel
+ ' now we try to find out details about this linux
+ IF sRawLine[3] LIKE "linux" THEN
+ SHELL "/bin/linux-boot-prober " & entry.Root TO sDump
+ IF Trim(sDump) THEN
+ sOptions = Split(Trim(sDump), ":")
+ entry.kernel = sOptions[3]
+ entry.initrd = sOptions[4]
+ entry.StartupOptions = Replace(sOptions[5], "root=" &
entry.Root, "")
+ END IF
+
+ END IF
+ ME.objMenuEntries.Add(entry)
+ NEXT
+
+
+END
+
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Mon Jun 8 14:24:32 2009
@@ -574,6 +574,9 @@
WAIT 1 ' brace yourselves... installation is about to begin
+ ' prepare boot menu entry objects for boot menu (this will only do
existing OS's ... we will need to create a new object for the isntalled
system after this process is done)
+ MdlBootMngr.CREATE_MENU_ENTRY_OBJECTS()
+
SELECT CASE iInstallType
CASE 0
GOTO FULL_INSTALL
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Mon Jun 8 14:24:32 2009
@@ -327,6 +327,8 @@
DIM cbox, cb AS ComboBox
DIM sPart, sFormat, sSize, sMntPoint AS String
DIM i, irow AS Integer
+ DIM sarr, scomp AS String[]
+ 'DIM scomp AS String
' ================= get the list of vital partitions
=====================
@@ -341,11 +343,17 @@
' Message(gvPartListing[irow, 0].Text & " - (" &
gvPartListing[irow, 1].Text & ") - " & gvPartListing[irow, 2].Text)
' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList &
cbox.Tag & "-" & sSize & "-" & cbox.Text & "-" & sFormat & ","
ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & sPart & "-" &
sSize & "-" & sMntPoint & "-" & sFormat & "|"
+ 'CATCH THE ROOT PARTITIONG HERE
+ IF sMntPoint = "/" THEN ClsGlobal.sRoot = sPart
END IF
END IF
NEXT
+
+
+
+
' =========== get list of swap partitions selected .(if any)
=====================
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Mon Jun 8 14:24:32 2009
@@ -77,7 +77,10 @@
sMntPnt = Trim(sEntry[2])
sFs = Trim(sEntry[3])
' set partition addresses to global class
- IF sMntPnt = "/" THEN ClsGlobal.sRoot = sPart
+
+ IF sMntPnt = "/" THEN
+ IF NOT (ClsGlobal.sRoot) THEN ClsGlobal.sRoot = sPart
+ END IF
IF sMntPnt = "/home" THEN ClsGlobal.shome = sPart
IF sfs LIKE ("Do not format") THEN
sFs = "(" & ("Not Formatted") & ")" & "," & Space(1) &
("Mount to") & Space(1)
Modified: branches/speedy/Step9.class
==============================================================================
--- branches/speedy/Step9.class (original)
+++ branches/speedy/Step9.class Mon Jun 8 14:24:32 2009
@@ -67,10 +67,40 @@
PUBLIC SUB OnExit()
+ ME.Create_New_install_menu_entry()
+END
+
+PUBLIC SUB Create_New_install_menu_entry()
+
+ DIM entry AS BootMenuEntry
+ DIM target AS BootMenuEntry
+ DIM bFound AS Boolean
+ FOR EACH entry IN MdlBootMngr.objMenuEntries
+ IF entry.Root = ClsGlobal.sRoot THEN ' I found an existing object
for this
+ target = entry
+ bFound = TRUE
+ END IF
+ NEXT
+
+ target.Root = ClsGlobal.sRoot
+ target.initrd = "/boot/initrd"
+ target.kernel = "/boot/vmlinuz"
+ target.sGrubLabel = ClsGlobal.sDistroName & Space(1) &
ClsGlobal.sDistroVer
+ target.sLIloLabel = ClsGlobal.sDistroName
+ target.Label = target.sLIloLabel
+ target.StartupOptions = "4 vga=791 ro"
+ target.Enabled = TRUE
+ target.IsDefault = TRUE
+ IF bFound = FALSE THEN
+ MdlBootMngr.objMenuEntries.Add(target)
+ END IF
+
END
+
+
PUBLIC SUB StartUp()
|
