[Vectorlinux-devel] [vinstall-ng commit] r537 - - Added function to convert strings like "/dev/hda1" to grub format

[<cod...@go...>]

Author: M0...@gm...
Date: Wed Apr 22 08:03:36 2009
New Revision: 537

Modified:
    branches/speedy/.lang/.pot
    branches/speedy/.lang/Step1.pot
    branches/speedy/.lang/Step6.pot
    branches/speedy/MdlBootMngr.module
    branches/speedy/Step1.class

Log:
- Added function to convert strings like "/dev/hda1" to grub format


Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot	(original)
+++ branches/speedy/.lang/.pot	Wed Apr 22 08:03:36 2009
@@ -760,15 +760,15 @@
  msgid "Searching your system for installable media"
  msgstr ""

-#: Step1.class:531
+#: Step1.class:537
  msgid "Select Installation Source"
  msgstr ""

-#: Step1.class:570
+#: Step1.class:576
  msgid "Search Again"
  msgstr ""

-#: Step1.class:600
+#: Step1.class:606
  msgid "Check Installation media before installing"
  msgstr ""

@@ -1021,11 +1021,11 @@
  msgid "This step cannot be undone. Are you sure you want to continue?"
  msgstr ""

-#: Step3a1a.class:186 Step6.class:540 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:462 Step7a.class:143
  msgid "Yes"
  msgstr ""

-#: Step3a1a.class:186 Step6.class:540 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:462 Step7a.class:143
  msgid "No"
  msgstr ""

@@ -1318,7 +1318,7 @@
  msgid "Please select only one partition for this purpose"
  msgstr ""

-#: Step6.class:433
+#: Step6.class:355
  msgid "Select which partitions to use for installation"
  msgstr ""


Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot	(original)
+++ branches/speedy/.lang/Step1.pot	Wed Apr 22 08:03:36 2009
@@ -110,15 +110,15 @@
  msgid "Searching your system for installable media"
  msgstr ""

-#: Step1.class:531
+#: Step1.class:537
  msgid "Select Installation Source"
  msgstr ""

-#: Step1.class:570
+#: Step1.class:576
  msgid "Search Again"
  msgstr ""

-#: Step1.class:600
+#: Step1.class:606
  msgid "Check Installation media before installing"
  msgstr ""


Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot	(original)
+++ branches/speedy/.lang/Step6.pot	Wed Apr 22 08:03:36 2009
@@ -58,15 +58,15 @@
  msgid "Please select only one partition for this purpose"
  msgstr ""

-#: Step6.class:433
+#: Step6.class:355
  msgid "Select which partitions to use for installation"
  msgstr ""

-#: Step6.class:540
+#: Step6.class:462
  msgid "Yes"
  msgstr ""

-#: Step6.class:540
+#: Step6.class:462
  msgid "No"
  msgstr ""


Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module	(original)
+++ branches/speedy/MdlBootMngr.module	Wed Apr 22 08:03:36 2009
@@ -456,5 +456,24 @@

  END

+PUBLIC FUNCTION convert_to_grub_format(sPartitionAddr AS String) AS String
+
+  DIM sAlpha AS String[] = Split("a b c d e f g h i k l m n o p q r s t u  
v w x y z", Space(1))
+  DIM sDrive, sPartAlpha, sRetVal AS String
+  DIM i, iPartNu AS Integer
+
+
+  'IF InStr(sPartitionAddr, "/") < 2 THEN RETURN ' invalid entry
+  'IF InStr(sPartitionAddr, "*[0-9]*") = FALSE THEN RETURN 'invalid entry
+  sPartAlpha = Left(sPartitionAddr, Len("/dev/hda")) ' trim this out
+  iPartNu = Right(sPartitionAddr, Len(sPartitionAddr) - Len("/dev/hda")) '  
cut the partition number from the string
+  i = sAlpha.Find(Right(sPartAlpha))
+
+  ' To grub, it's always "hd" even if the drive is a sata interface
+  sRetVal = "(hd" & i & "," & iPartNu & ")"
+  RETURN sRetVal
+
+
+END



Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class	(original)
+++ branches/speedy/Step1.class	Wed Apr 22 08:03:36 2009
@@ -493,3 +493,5 @@
    ME.tlNext.Visible = TRUE

  END
+
+