Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r524 - better linux os detection
|
From: <cod...@go...> - 2009-03-27 21:29:57
|
Author: M0...@gm...
Date: Fri Mar 27 14:01:13 2009
New Revision: 524
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/MdlBootMngr.module
Log:
better linux os detection
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Mar 27 14:01:13 2009
@@ -14,88 +14,88 @@
msgid "VectorLinux Installer"
msgstr ""
-#: Conf0.class:63 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:64 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:120
+#: Conf0.class:121
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:138
+#: Conf0.class:139
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:146
+#: Conf0.class:147
msgid "LILO"
msgstr ""
-#: Conf0.class:152
+#: Conf0.class:153
msgid "Grub"
msgstr ""
-#: Conf0.class:157
+#: Conf0.class:158
msgid ""
"Select this option if you want to configure your system boot manager "
"manually at a later time"
msgstr ""
-#: Conf0.class:159
+#: Conf0.class:160
msgid "None (Experts Only)"
msgstr ""
-#: Conf0.class:167
+#: Conf0.class:168
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:179
+#: Conf0.class:180
msgid "Target"
msgstr ""
-#: Conf0.class:186
+#: Conf0.class:187
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:199
+#: Conf0.class:200
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:206
+#: Conf0.class:207
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:218
+#: Conf0.class:219
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:230
+#: Conf0.class:231
msgid "Seconds"
msgstr ""
-#: Conf0.class:243
+#: Conf0.class:244
msgid "Boot Default"
msgstr ""
-#: Conf0.class:262
+#: Conf0.class:263
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:273
+#: Conf0.class:275
msgid "Tab 0"
msgstr ""
@@ -163,8 +163,28 @@
msgid "Select the location to which we will resize"
msgstr ""
-#: MdlBootMngr.module:110
+#: MdlBootMngr.module:114
msgid "Installation found in"
+msgstr ""
+
+#: MdlBootMngr.module:132
+msgid "Include in boot menu"
+msgstr ""
+
+#: MdlBootMngr.module:151
+msgid "Name"
+msgstr ""
+
+#: MdlBootMngr.module:167
+msgid "Initial RAM disk image"
+msgstr ""
+
+#: MdlBootMngr.module:184
+msgid "Kernel boot options"
+msgstr ""
+
+#: MdlBootMngr.module:209
+msgid "Add option to boot this operating system into text mode"
msgstr ""
#: MdlMain.module:33
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Fri Mar 27 14:01:13 2009
@@ -14,83 +14,83 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf0.class:63
+#: Conf0.class:64
msgid "WARNING:"
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:120
+#: Conf0.class:121
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:138
+#: Conf0.class:139
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:146
+#: Conf0.class:147
msgid "LILO"
msgstr ""
-#: Conf0.class:152
+#: Conf0.class:153
msgid "Grub"
msgstr ""
-#: Conf0.class:157
+#: Conf0.class:158
msgid "Select this option if you want to configure your system boot
manager manually at a later time"
msgstr ""
-#: Conf0.class:159
+#: Conf0.class:160
msgid "None (Experts Only)"
msgstr ""
-#: Conf0.class:167
+#: Conf0.class:168
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:179
+#: Conf0.class:180
msgid "Target"
msgstr ""
-#: Conf0.class:186
+#: Conf0.class:187
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:199
+#: Conf0.class:200
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:206
+#: Conf0.class:207
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:218
+#: Conf0.class:219
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:230
+#: Conf0.class:231
msgid "Seconds"
msgstr ""
-#: Conf0.class:243
+#: Conf0.class:244
msgid "Boot Default"
msgstr ""
-#: Conf0.class:262
+#: Conf0.class:263
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:273
+#: Conf0.class:275
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Fri Mar 27 14:01:13 2009
@@ -14,7 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlBootMngr.module:110
+#: MdlBootMngr.module:114
msgid "Installation found in"
+msgstr ""
+
+#: MdlBootMngr.module:132
+msgid "Include in boot menu"
+msgstr ""
+
+#: MdlBootMngr.module:151
+msgid "Name"
+msgstr ""
+
+#: MdlBootMngr.module:167
+msgid "Initial RAM disk image"
+msgstr ""
+
+#: MdlBootMngr.module:184
+msgid "Kernel boot options"
+msgstr ""
+
+#: MdlBootMngr.module:209
+msgid "Add option to boot this operating system into text mode"
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Fri Mar 27 14:01:13 2009
@@ -24,7 +24,7 @@
END
PUBLIC SUB StartUp()
- 'MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
+ IF MdlBootMngr.bScanned = FALSE OR NOT MdlBootMngr.bScanned THEN
MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
END
PUBLIC SUB OnExit()
@@ -40,6 +40,7 @@
WITH ME
.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
.tlSep.Text = "<b>" & tlsep.Text & "</b>"
+
END WITH
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Fri Mar 27 14:01:13 2009
@@ -57,7 +57,7 @@
Spacing = 4
Padding = 2
{ tlLiloTarget TextLabel
- MoveScaled(1,0,16.25,3)
+ MoveScaled(1,0,10,3)
Expand = True
AutoResize = True
Text = ("Target")
@@ -138,6 +138,7 @@
{ TsOsListing TabStrip
MoveScaled(1,29,81,36)
Expand = True
+ Arrangement = Arrange.Row
AutoResize = True
Index = 0
Text = ("Tab 0")
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Fri Mar 27 14:01:13 2009
@@ -16,6 +16,8 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
'====================================================================================================
+PUBLIC bScanned AS Boolean
+
PUBLIC FUNCTION ID_LINUX(sMountedLocation AS String) AS String
DIM sRes AS String
@@ -88,6 +90,8 @@
DIM tb AS TextBox
DIM tl AS TextLabel
DIM cb AS CheckBox
+ DIM hb AS HBox
+ DIM comb AS ComboBox
IF NOT sLinux OR Len(Trim(sLinux)) <= 0 THEN RETURN
'Message(sLinux)
@@ -109,12 +113,111 @@
WITH tl
.Text = ("Installation found in") & Space(1) & sLinuxRoot
.Height = 24
+ .Alignment = Align.Left
.Width = 200
.Expand = TRUE
- .Border = Border.Plain
+ '.Border = Border.Plain
'.AutoResize = TRUE
.Move(4, 4)
END WITH
+ hb = NEW HBox(objTabStrip) ' separator space
+ WITH hb
+ .Height = 16
+ .Width = 12
+ .Expand = TRUE
+ END WITH
+ cb = NEW CheckBox(objTabStrip) ' Inlcude/Exclude OS from boot menu
+ WITH cb
+ .Expand = TRUE
+ .Text = ("Include in boot menu")
+ .Value = TRUE
+ .Height = 24
+ .Tag = sLinuxRoot
+ END WITH
+ hb = NEW HBox(objTabStrip) ' separator space
+ WITH hb
+ .Height = 12
+ .Expand = TRUE
+ END WITH
+ hb = NEW HBox(objTabStrip) ' This will hold a few objects of it's own
+ WITH hb
+ .Height = 28
+ .Expand = TRUE
+ .Padding = 2
+ .Spacing = 2
+ END WITH
+ tl = NEW TextLabel(hb) ' Name label
+ WITH tl
+ .Text = ("Name")
+ .Expand = FALSE
+ .Width = 200
+ .Adjust()
+ .AutoResize = TRUE
+ .Height = .Parent.Height
+ .Alignment = Align.Left
+ END WITH
+ tb = NEW TextBox(hb) ' Name entry box
+ WITH tb
+ .Expand = TRUE
+ .Height = .Parent.Height
+ .Tag = sLinuxRoot
+ END WITH
+ tl = NEW TextLabel(hb) ' initrd label
+ WITH tl
+ .text = ("Initial RAM disk image")
+ .Alignment = Align.Right
+ .Height = .Parent.Height
+ .Expand = TRUE
+ END WITH
+ comb = NEW ComboBox(hb) ' initrd selection combobox
+ WITH comb
+ .Height = .Parent.Height
+ .Expand = TRUE
+ .READonly = TRUE
+ .Tag = sLinuxRoot
+ END WITH
+ hb = NEW HBox(objTabStrip) ' blank space separator
+ hb.Height = 8
+ hb.Expand = TRUE
+ tl = NEW TextLabel(objTabStrip) ' append line textlabel
+ WITH tl
+ .Text = ("Kernel boot options")
+ .Height = 24
+ .Width = 200
+ .Alignment = Align.Left
+ .Expand = FALSE
+ .AutoResize = TRUE
+ END WITH
+ tb = NEW TextBox(objTabStrip) ' append input line
+ WITH tb
+ .Text = "splash=silent"
+ .Height = 24
+ .Expand = TRUE
+ .Tag = sLinuxRoot
+ END WITH
+
+ ' ======================= ONLY FOR THE OS WE JUST INSTALLED
===============================
+ IF sLinuxRoot = ClsGlobal.sRoot THEN
+ hb = NEW HBox(objTabStrip) ' yet another separator
+ WITH hb
+ .Expand = TRUE
+ .Height = 8
+ END WITH
+ cb = NEW CheckBox(objTabStrip) AS "bCLIOption"
+ WITH cb
+ .Value = TRUE
+ .Text = ("Add option to boot this operating system into text mode")
+ .Height = 24
+ .Expand = TRUE
+ .Tag = sLinuxRoot
+ END WITH
+ hb = NEW HBox(objTabStrip)
+ hb.Height = 4
+ hb.Expand = TRUE
+
+ END IF
+
+
END
@@ -127,7 +230,7 @@
DIM i AS Integer
DIM sOutcome AS String
-
+ bScanned = TRUE
'Message(ClsGlobal.sRoot)
' Message(Trim(sPartList[i]))
@@ -145,6 +248,8 @@
sOutcome = ME.Find_Linux(Trim(sPartList[i]))
' will only list the linux IF one IS present
IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
+ INC objTabStrip.Count
+ objTabStrip.Index = objTabStrip.Count - 1
populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
END IF
'END IF
|
