[Vectorlinux-devel] [vinstall-ng commit] r489 - in branches/speedy: . .lang

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

Author: M0...@gm...
Date: Wed Feb 11 08:02:05 2009
New Revision: 489

Modified:
    branches/speedy/.lang/.pot
    branches/speedy/.lang/Step3a2.pot
    branches/speedy/Step3a2.class

Log:
Auto partition creation complete

Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot	(original)
+++ branches/speedy/.lang/.pot	Wed Feb 11 08:02:05 2009
@@ -356,11 +356,11 @@
  "consider using a different partitioning option."
  msgstr ""

-#: Step3a2.class:320
+#: Step3a2.class:361
  msgid "Partitioning stage complete... Click next to continue"
  msgstr ""

-#: Step3a2.class:433
+#: Step3a2.class:474
  msgid "RadioButton1"
  msgstr ""


Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot	(original)
+++ branches/speedy/.lang/Step3a2.pot	Wed Feb 11 08:02:05 2009
@@ -58,11 +58,11 @@
  msgid "Unable to find enough un-used space to perform auto-partition.  
Please consider using a different partitioning option."
  msgstr ""

-#: Step3a2.class:320
+#: Step3a2.class:361
  msgid "Partitioning stage complete... Click next to continue"
  msgstr ""

-#: Step3a2.class:433
+#: Step3a2.class:474
  msgid "RadioButton1"
  msgstr ""


Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class	(original)
+++ branches/speedy/Step3a2.class	Wed Feb 11 08:02:05 2009
@@ -280,41 +280,30 @@

                              ' PROCEED TO CREATE PARTITIONS IN NEWLY  
CALCULATED FREE SPACE
                            SHELL "parted " & Trim(sDrive) & " -s \"mkpart  
logical reiserfs " & lFreeStart & "kb " & (lFreeEnd - lNeededSwap) & "kb\""  
WAIT
-                          'SHELL "parted " & Trim(sdrive) & " mkfs  
reiserfs " & (iLastPartNo + 2)  WAIT
-                          'SHELL "mkfs.reiserfs -fq " & sDrive &  
(iLastPartNo + 2) WAIT
-                          'EXEC ["mkfs.reiserfs", "-fq", sDrive &  
(iLastPartNo + 2)] WAIT
-                          'SHELL "parted " & Trim(sdrive) & " -s \"mkpart  
logical linux-swap " & (lFreeEnd - lNeededSwap) & "kb " & lFreeEnd & "kb  
yes\"" WAIT
-                          SHELL "parted " & Trim(sdrive) & " mkpart  
logical linux-swap " & (lFreeEnd - lNeededSwap) & "kb " & lFreeEnd & "kb >  
echo \"Yes\"" WAIT
-                          SHELL "mkswap " & Trim(sdrive) & (iLastPartNo +  
3) WAIT
-
+                          'SHELL "echo yes | parted " & Trim(sdrive) & "  
mkfs reiserfs " & (iLastPartNo + 2) WAIT
+                          SHELL "mkfs.reiserfs -fq " & sDrive &  
(iLastPartNo + 2) WAIT

-
-                          'SHELL "parted " & Trim(sdrive) & " -s \"mkpart  
logical linux-swap " & (lFreeEnd - (lNeededSwap - 1)) & "kb " & (lFreeEnd -  
1) & "kb\" " WAIT
-                          'EXEC ["mkswap", Trim(sdrive) & (iLastPartNo +  
3)] WAIT
-                          'EXEC ["swapon", Trim(sdrive) & (iLastPartNo +  
3)] WAIT
-
-
-
-
-
+                          ' ####################### RECALCULATE FREE SPACE  
########################################
+                            SHELL "parted " & Trim(sDrive) & " unit gb  
print free | grep -i \"free space\" | tr -s \' \',\"\" | cut -f 2-4 -d \'  
\'" TO sPartedRes
+                                          'Message(sPartedRes)
+                                    sPartedRes = Trim(sPartedRes) ' |  
START | | END | | SIZE |
+                                      sOutLine = Split(sPartedRes,  
Space(1))
+                                        sFreeStart = sOutLine[0]
+                                        sFreeEnd = sOutLine[1]
+                                        sFreeSize = sOutLine[2]
+                            SHELL "parted " & Trim(sdrive) & " mkpart  
logical linux-swap " & sFreeStart & " " & sFreeEnd WAIT
+                                ' ^^^^^^^^ IN CASE THE ABOVE LINE DOESN'T  
WORK, THE FOLLOWING CODE MAY BE USED TO PERFORM THE SAME OPERATION  
^^^^^^^^^^
+
+                            ' ' ' ' ' sDump = "#!/bin/bash \n" &
+                            ' ' ' ' ' "parted " & Trim(sdrive) & " mkpart  
logical linux-swap " & sFreeStart & " " & sFreeEnd & " \n" &
+                            ' ' ' ' ' "<<EOF \n" &
+                            ' ' ' ' ' "yes \n" &
+                            ' ' ' ' ' "EOF"
+                            ' ' ' ' ' File.Save("/tmp/swapmaker", sDump)
+                            ' ' ' ' ' SHELL "sh /tmp/swapmaker" WAIT
                        END IF

            END IF
-
-
-      'parted /dev/hda print free | grep -i "Free space" |tr -s ' ',"" |  
cut -f 2-4 -d ' '
-
-
-    ' root:# parted /dev/hda --script "mkpartfs primary linux-swap -512kb  
-1kb" ' SAMPLE PARTED LINE
-
-
-
-    ' FOR i = 0 TO 20
-    '   WAIT 2
-    ' NEXT
-    '
-    ' ME.MovieBox1.Playing = FALSE
-    ' Message("Finished")


      ME.tlSelAutoTarget.Text = ("Partitioning stage complete... Click next  
to continue")