Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r505 - in branches/speedy: . .lang
|
From: <cod...@go...> - 2009-02-25 23:33:15
|
Author: M0...@gm...
Date: Wed Feb 25 14:08:32 2009
New Revision: 505
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a1a.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/Step5.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step8.pot
branches/speedy/Step3.class
branches/speedy/Step3a1a.class
branches/speedy/Step3a2.class
branches/speedy/Step5.class
branches/speedy/Step8.class
Log:
Debugged automatic partition. Ready for testing. Finished summary on
automatic partitioning and for customized installations
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 25 14:08:32 2009
@@ -50,7 +50,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:121
+#: MdlStartUp.module:47 Step8.class:130
msgid "Software Selection"
msgstr ""
@@ -58,7 +58,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:190
+#: MdlStartUp.module:49 Step8.class:213
msgid "Installation Summary"
msgstr ""
@@ -156,7 +156,7 @@
msgid "to search for media again"
msgstr ""
-#: Step1.class:98 Step2.class:198 Step5.class:166
+#: Step1.class:98 Step2.class:198 Step5.class:177
msgid "Click"
msgstr ""
@@ -216,7 +216,7 @@
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433 Step3a1a.class:169 Step3a1.class:22 Step7a.class:143
+#: Step1.class:433 Step3a1a.class:186 Step3a1.class:22 Step7a.class:143
msgid "WARNING:"
msgstr ""
@@ -376,43 +376,43 @@
msgid "Create New"
msgstr ""
-#: Step3a1a.class:148
+#: Step3a1a.class:160
msgid "Failed to format partitions, please try another partitioning method"
msgstr ""
-#: Step3a1a.class:160
+#: Step3a1a.class:177
msgid "Partitioning stage complete. Click"
msgstr ""
-#: Step3a1a.class:160 Step3a2.class:322 Step5.class:166
+#: Step3a1a.class:177 Step3a2.class:359 Step5.class:177
msgid "to continue"
msgstr ""
-#: Step3a1a.class:169
+#: Step3a1a.class:186
msgid "All existing data in"
msgstr ""
-#: Step3a1a.class:169
+#: Step3a1a.class:186
msgid "is about to be deleted."
msgstr ""
-#: Step3a1a.class:169
+#: Step3a1a.class:186
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:169 Step6.class:499 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:434 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:169 Step6.class:499 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:434 Step7a.class:143
msgid "No"
msgstr ""
-#: Step3a1a.class:173
+#: Step3a1a.class:190
msgid "Preparing hard disk for new partitioning structure. Please wait"
msgstr ""
-#: Step3a1a.class:193
+#: Step3a1a.class:210
msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
@@ -458,39 +458,39 @@
"VectorLinux"
msgstr ""
-#: Step3a2.class:191
+#: Step3a2.class:192
msgid "Please wait while your hard drive is being partitioned"
msgstr ""
-#: Step3a2.class:204
+#: Step3a2.class:205
msgid "Unable to find enough un-used space to perform auto-partition."
msgstr ""
-#: Step3a2.class:204
+#: Step3a2.class:205
msgid "Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:206
+#: Step3a2.class:207
msgid ""
"Unable to find enough un-used space to perform auto-partition. Please "
"consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:322
+#: Step3a2.class:359
msgid "Partitioning stage complete... Click"
msgstr ""
-#: Step3a2.class:352
+#: Step3a2.class:407
msgid ""
"We are unable to find any hard disks with enough unpartitioned space for "
"this operation."
msgstr ""
-#: Step3a2.class:352
+#: Step3a2.class:407
msgid "Please consider using another partitioning method."
msgstr ""
-#: Step3a2.class:354
+#: Step3a2.class:409
msgid ""
"Unable to find any hard drives with enough unpartitioned space. Please
go "
"back and select another partitioning method"
@@ -555,29 +555,29 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:153
+#: Step3.class:175
msgid "Automatic"
msgstr ""
-#: Step3.class:163
+#: Step3.class:185
msgid ""
"Automatically resize your partitions and / or create the correct disk
space "
"for VectorLinux."
msgstr ""
-#: Step3.class:170
+#: Step3.class:192
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:180
+#: Step3.class:202
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:187
+#: Step3.class:209
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:197
+#: Step3.class:219
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
@@ -589,91 +589,101 @@
msgid "Resize partitions using Gparted"
msgstr ""
-#: Step5.class:64
+#: Step5.class:67
msgid ""
"Gparted was not found on this system. Please install gparted and try
again"
msgstr ""
#: Step5.class:69
+msgid "Unable to launch partitioning tool."
+msgstr ""
+
+#: Step5.class:69
+msgid ""
+"The gparted program was not found on this system. Please install gparted
or "
+"choose another partitioning method."
+msgstr ""
+
+#: Step5.class:80
msgid "Loading partitioning utility...Please Wait"
msgstr ""
-#: Step5.class:92
+#: Step5.class:103
msgid ""
"The VectorLinux installer is unable to embed the gparted partitioning "
"utility."
msgstr ""
-#: Step5.class:92
+#: Step5.class:103
msgid ""
"Please consider using the automatic partition option, or use other means
of"
msgstr ""
-#: Step5.class:92
+#: Step5.class:103
msgid "partitioning your hard drives."
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid ""
"VectorLinux is about to launch the GParted partitioning tool. Use this "
"utility to"
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid "move, resize, delete or create partitions."
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid "When you are finished, you will need to exit the utility from the"
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid "GParted"
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid "menu"
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "SYSTEM RESTART SUGGESTED"
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid ""
"Your system still contains some non-linux partitions. If you still have
a "
"Windows operating system installed, it is recomended "
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "that you reboot your system at this time. "
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "Click the"
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "button to restart your computer now, or click"
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "to continue without restarting."
msgstr ""
-#: Step5.class:166
+#: Step5.class:177
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:182
+#: Step5.class:193
msgid "Your computer will restart in 10 seconds"
msgstr ""
-#: Step5.class:239
+#: Step5.class:250
msgid "Loading partitioning utility ... Please Wait"
msgstr ""
-#: Step5.class:248
+#: Step5.class:259
msgid "Restart Now"
msgstr ""
@@ -697,7 +707,7 @@
msgid "Not Used"
msgstr ""
-#: Step6.class:167 Step8.class:71
+#: Step6.class:167 Step8.class:73
msgid "Do not format"
msgstr ""
@@ -717,7 +727,7 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:394
+#: Step6.class:329
msgid "Select which partitions to use for installation"
msgstr ""
@@ -789,7 +799,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:111
+#: Step7.class:126 Step8.class:120
msgid "Customized"
msgstr ""
@@ -797,7 +807,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:113
+#: Step7.class:144 Step8.class:122
msgid "Minimal"
msgstr ""
@@ -805,43 +815,55 @@
msgid "Install the most minimal working confuguration (For older hardware)"
msgstr ""
-#: Step8.class:72
+#: Step8.class:44
+msgid "Distribution"
+msgstr ""
+
+#: Step8.class:62
+msgid "Partitions to be used"
+msgstr ""
+
+#: Step8.class:74
msgid "Not Formatted"
msgstr ""
-#: Step8.class:72
+#: Step8.class:74
msgid "Mount to"
msgstr ""
-#: Step8.class:74
+#: Step8.class:76
msgid "Format to"
msgstr ""
-#: Step8.class:74
+#: Step8.class:76
msgid "and mount to"
msgstr ""
-#: Step8.class:86
+#: Step8.class:88
msgid "Swap Space"
msgstr ""
-#: Step8.class:109
+#: Step8.class:101
+msgid "Pre-formatted to reiserfs, and used for /"
+msgstr ""
+
+#: Step8.class:118
msgid "Full"
msgstr ""
-#: Step8.class:116
+#: Step8.class:125
msgid "Installation Method"
msgstr ""
-#: Step8.class:122
+#: Step8.class:131
msgid "Major Components"
msgstr ""
-#: Step8.class:132
+#: Step8.class:141
msgid "Additional Software"
msgstr ""
-#: Step8.class:209
+#: Step8.class:232
msgid ""
"Your VectorLinux installation is about to be performed as follows. If
you "
"need to make any changes, this is your last chance."
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Wed Feb 25 14:08:32 2009
@@ -22,27 +22,27 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:153
+#: Step3.class:175
msgid "Automatic"
msgstr ""
-#: Step3.class:163
+#: Step3.class:185
msgid "Automatically resize your partitions and / or create the correct
disk space for VectorLinux."
msgstr ""
-#: Step3.class:170
+#: Step3.class:192
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:180
+#: Step3.class:202
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:187
+#: Step3.class:209
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:197
+#: Step3.class:219
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
Modified: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- branches/speedy/.lang/Step3a1a.pot (original)
+++ branches/speedy/.lang/Step3a1a.pot Wed Feb 25 14:08:32 2009
@@ -46,47 +46,47 @@
msgid "Create New"
msgstr ""
-#: Step3a1a.class:148
+#: Step3a1a.class:160
msgid "Failed to format partitions, please try another partitioning method"
msgstr ""
-#: Step3a1a.class:160
+#: Step3a1a.class:177
msgid "Partitioning stage complete. Click"
msgstr ""
-#: Step3a1a.class:160
+#: Step3a1a.class:177
msgid "to continue"
msgstr ""
-#: Step3a1a.class:169
+#: Step3a1a.class:186
msgid "WARNING:"
msgstr ""
-#: Step3a1a.class:169
+#: Step3a1a.class:186
msgid "All existing data in"
msgstr ""
-#: Step3a1a.class:169
+#: Step3a1a.class:186
msgid "is about to be deleted."
msgstr ""
-#: Step3a1a.class:169
+#: Step3a1a.class:186
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:169
+#: Step3a1a.class:186
msgid "Yes"
msgstr ""
-#: Step3a1a.class:169
+#: Step3a1a.class:186
msgid "No"
msgstr ""
-#: Step3a1a.class:173
+#: Step3a1a.class:190
msgid "Preparing hard disk for new partitioning structure. Please wait"
msgstr ""
-#: Step3a1a.class:193
+#: Step3a1a.class:210
msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Wed Feb 25 14:08:32 2009
@@ -42,39 +42,39 @@
msgid "Select the location on your hard drive where you would like to
install VectorLinux"
msgstr ""
-#: Step3a2.class:191
+#: Step3a2.class:192
msgid "Please wait while your hard drive is being partitioned"
msgstr ""
-#: Step3a2.class:204
+#: Step3a2.class:205
msgid "Unable to find enough un-used space to perform auto-partition."
msgstr ""
-#: Step3a2.class:204
+#: Step3a2.class:205
msgid "Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:206
+#: Step3a2.class:207
msgid "Unable to find enough un-used space to perform auto-partition.
Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:322
+#: Step3a2.class:359
msgid "Partitioning stage complete... Click"
msgstr ""
-#: Step3a2.class:322
+#: Step3a2.class:359
msgid "to continue"
msgstr ""
-#: Step3a2.class:352
+#: Step3a2.class:407
msgid "We are unable to find any hard disks with enough unpartitioned
space for this operation."
msgstr ""
-#: Step3a2.class:352
+#: Step3a2.class:407
msgid "Please consider using another partitioning method."
msgstr ""
-#: Step3a2.class:354
+#: Step3a2.class:409
msgid "Unable to find any hard drives with enough unpartitioned space.
Please go back and select another partitioning method"
msgstr ""
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Wed Feb 25 14:08:32 2009
@@ -18,91 +18,99 @@
msgid "Resize partitions using Gparted"
msgstr ""
-#: Step5.class:64
+#: Step5.class:67
msgid "Gparted was not found on this system. Please install gparted and
try again"
msgstr ""
#: Step5.class:69
+msgid "Unable to launch partitioning tool."
+msgstr ""
+
+#: Step5.class:69
+msgid "The gparted program was not found on this system. Please install
gparted or choose another partitioning method."
+msgstr ""
+
+#: Step5.class:80
msgid "Loading partitioning utility...Please Wait"
msgstr ""
-#: Step5.class:92
+#: Step5.class:103
msgid "The VectorLinux installer is unable to embed the gparted
partitioning utility."
msgstr ""
-#: Step5.class:92
+#: Step5.class:103
msgid "Please consider using the automatic partition option, or use other
means of"
msgstr ""
-#: Step5.class:92
+#: Step5.class:103
msgid "partitioning your hard drives."
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid "VectorLinux is about to launch the GParted partitioning tool. Use
this utility to"
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid "move, resize, delete or create partitions."
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid "When you are finished, you will need to exit the utility from the"
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid "GParted"
msgstr ""
-#: Step5.class:114
+#: Step5.class:125
msgid "menu"
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "SYSTEM RESTART SUGGESTED"
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "Your system still contains some non-linux partitions. If you still
have a Windows operating system installed, it is recomended "
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "that you reboot your system at this time. "
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "Click the"
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "button to restart your computer now, or click"
msgstr ""
-#: Step5.class:161
+#: Step5.class:172
msgid "to continue without restarting."
msgstr ""
-#: Step5.class:166
+#: Step5.class:177
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:166
+#: Step5.class:177
msgid "Click"
msgstr ""
-#: Step5.class:166
+#: Step5.class:177
msgid "to continue"
msgstr ""
-#: Step5.class:182
+#: Step5.class:193
msgid "Your computer will restart in 10 seconds"
msgstr ""
-#: Step5.class:239
+#: Step5.class:250
msgid "Loading partitioning utility ... Please Wait"
msgstr ""
-#: Step5.class:248
+#: Step5.class:259
msgid "Restart Now"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Wed Feb 25 14:08:32 2009
@@ -54,15 +54,15 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:394
+#: Step6.class:329
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:499
+#: Step6.class:434
msgid "Yes"
msgstr ""
-#: Step6.class:499
+#: Step6.class:434
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Wed Feb 25 14:08:32 2009
@@ -14,63 +14,75 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step8.class:71
+#: Step8.class:44
+msgid "Distribution"
+msgstr ""
+
+#: Step8.class:62
+msgid "Partitions to be used"
+msgstr ""
+
+#: Step8.class:73
msgid "Do not format"
msgstr ""
-#: Step8.class:72
+#: Step8.class:74
msgid "Not Formatted"
msgstr ""
-#: Step8.class:72
+#: Step8.class:74
msgid "Mount to"
msgstr ""
-#: Step8.class:74
+#: Step8.class:76
msgid "Format to"
msgstr ""
-#: Step8.class:74
+#: Step8.class:76
msgid "and mount to"
msgstr ""
-#: Step8.class:86
+#: Step8.class:88
msgid "Swap Space"
msgstr ""
-#: Step8.class:109
+#: Step8.class:101
+msgid "Pre-formatted to reiserfs, and used for /"
+msgstr ""
+
+#: Step8.class:118
msgid "Full"
msgstr ""
-#: Step8.class:111
+#: Step8.class:120
msgid "Customized"
msgstr ""
-#: Step8.class:113
+#: Step8.class:122
msgid "Minimal"
msgstr ""
-#: Step8.class:116
+#: Step8.class:125
msgid "Installation Method"
msgstr ""
-#: Step8.class:121
+#: Step8.class:130
msgid "Software Selection"
msgstr ""
-#: Step8.class:122
+#: Step8.class:131
msgid "Major Components"
msgstr ""
-#: Step8.class:132
+#: Step8.class:141
msgid "Additional Software"
msgstr ""
-#: Step8.class:190
+#: Step8.class:213
msgid "Installation Summary"
msgstr ""
-#: Step8.class:209
+#: Step8.class:232
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/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Wed Feb 25 14:08:32 2009
@@ -41,24 +41,44 @@
ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pDone
ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
IF ME.rbAutoPart.Value = TRUE THEN
+
+ RETURN "Step3a"
+ END IF
+ IF ME.rbCustomPart.Value = TRUE THEN
+
+ RETURN "Step5"
+ END IF
+ IF ME.rbPrePartitioned.Value = TRUE THEN
+
+ RETURN "Step6"
+ END IF
+
+END
+
+PUBLIC SUB SET_PARTITIONING_METHOD()
+
+ IF ME.rbAutoPart.Value = TRUE THEN
ClsGlobal.bAutoPartition = TRUE
PRINT " ---> Use built-in auto partition tools for partitioning"
- RETURN "Step3a"
+ 'RETURN "Step3a"
END IF
IF ME.rbCustomPart.Value = TRUE THEN
'embed gparted
PRINT " ---> Embed GParted for partitioning"
ClsGlobal.bAutoPartition = FALSE
- RETURN "Step5"
+ 'RETURN "Step5"
END IF
IF ME.rbPrePartitioned.Value = TRUE THEN
' Use existing partitions
PRINT " ---> Install to pre-partitioned hard drive"
ClsGlobal.bAutoPartition = FALSE
- RETURN "Step6"
+ 'RETURN "Step6"
END IF
END
+
+
+
PUBLIC SUB StartUp()
ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
@@ -68,6 +88,8 @@
END
PUBLIC SUB OnExit()
+
+ ME.SET_PARTITIONING_METHOD()
END
Modified: branches/speedy/Step3a1a.class
==============================================================================
--- branches/speedy/Step3a1a.class (original)
+++ branches/speedy/Step3a1a.class Wed Feb 25 14:08:32 2009
@@ -87,7 +87,13 @@
sResults = Split(sSwapList, "\n")
sSwapPart = sResults[0]
PRINT " --- Use existing swap partition " & sSwapPart
- ClsGlobal.sTargetSwap = sSwapPart ' set the address to the
swap partition.
+
+ ' detect size of swap partition
+ SHELL "parted " & Left(sSwapPart, Len("/dev/hda")) & "
unit GB print | grep \"^ " & Right(sSwapPart, Len(sSwapPart) -
Len("/dev/hda")) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump
+ 'Message("Size dump for swap " & sDump)
+ 'SHELL "echo \"" & Trim(sDump) & "\" cut -f 3 -d \' \'" TO
sDump
+
+ ClsGlobal.sTargetSwap = Trim(sSwapPart & "-" & Trim(sDump)) '
set the address to the swap partition.
'Message("Using swap " & sSwapPart)
END SELECT
ELSE ' no swap found
@@ -132,8 +138,14 @@
PRINT " --- Creating swap partition at " & sDrive & "2 ... Size
= " & lNeededSwap & " Kb"
SHELL "parted " & sDrive & " mkpartfs primary linux-swap " &
Trim(sPartedDetails[0]) & " " & Trim(sPartedDetails[2]) & " 1 > /dev/null "
WAIT
- ClsGlobal.sTargetRoot = sDrive & "1"
- ClsGlobal.sTargetSwap = sDrive & "2"
+ ' get partition sizes now
+ SHELL "parted " & sDrive & " unit GB print | grep \"^ 1\" | tr
-s \' \',\"\" | cut -f 5 -d \' \'" TO sDump
+ 'SHELL "parted " & Left(sSwapPart, Len("/dev/hda")) & " unit GB
print | grep \"^ " & Right(sSwapPart, Len(sSwapPart) - Len("/dev/hda"))
& "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump
+' SHELL "echo \"" & Trim(sDump) & " cut -f 3 -d \' \'" TO sDump
+ ClsGlobal.sTargetRoot = Trim(sDrive & "1" & "-" & Trim(sDump))
+ SHELL "parted " & sDrive & " unit GB print | grep \"^ 2\" | tr
-s \' \',\"\" | cut -f 5 -d \' \'" TO sDump
+ 'SHELL "echo \"" & Trim(sDump) & " cut -f 3 -d \' \'" TO sDump
+ ClsGlobal.sTargetSwap = Trim(sDrive & "2" & "-" & Trim(sDump))
ELSE
@@ -148,8 +160,13 @@
sStatus = ("Failed to format partitions, please try another
partitioning method")
RETURN
END IF
+
+ SHELL "parted " & sDrive & " unit GB print | grep \"^ 1\" | tr
-s \' \',\"\" | cut -f 5 -d \' \'" TO sDump
+ 'SHELL "echo \"" & Trim(sDump) & " cut -f 3 -d \' \'" TO sDump
+ ClsGlobal.sTargetRoot = Trim(sDrive & "1" & "-" & Trim(sDump))
- ClsGlobal.sTargetRoot = sDrive & "1"
+ '
+ 'ClsGlobal.sTargetRoot = sDrive & "1"
'SHELL "mkfs.reiserfs -q " & sDrive & "1" WAIT
'Message(sPartedDetails[0])
'Message(sPartedDetails[1])
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Wed Feb 25 14:08:32 2009
@@ -25,9 +25,9 @@
ME.tlbanner.Text = "<h2>" & ("Install VectorLinux to free space on
disk") & "</H2>"
ME.MovieBox1.Path = "images/throbber.gif"
ME.MovieBox1.Playing = FALSE
- objTargetOptions = NEW Object[]
+ 'objTargetOptions = NEW Object[]
- ME.LIST_FREE_SPACE()
+ 'ME.LIST_FREE_SPACE()
END
@@ -183,6 +183,7 @@
DIM sOutLine, sDumparr AS String[]
DIM lFreeKB, lFreeStart, lFreeEnd AS Long
DIM sRootPart, sSwapPart AS String
+ DIM sPart, sNum AS String
ME.HPanel3.Visible = FALSE
@@ -232,12 +233,22 @@
SHELL "parted " & Trim(sDrive) & " -s \"mkpart primary
reiserfs 0kb -" & lNeededSwap & "kb\"" WAIT ' partition 1
'WAIT 1
- SHELL "parted " & Trim(sDrive) & " -s \"mkpart primary
linux-swap -" & lNeededSwap & "kb -1kb\"" WAIT ' partition 2
- SHELL "mkswap " & Trim(sDrive) & (iLastPartNo + 2) WAIT '
make the swap partition
- EXEC ["swapon", Trim(sDrive) & (iLastPartNo + 2)] WAIT
-
+ SHELL "probepart | grep -i \"linux swap\"| cut -f 1 -d \' \'" TO
sDump
+ sDump = Trim(sDump) ' this is possibly an array
+ IF sDump THEN
+ sDumparr = Split(sDump, "\n")
+ PRINT " ---+ Use existing swap partition -> " &
sDumparr[0]
+ sSwapPart = Trim(sDumparr[0])
+
+
+ ELSE
+ SHELL "parted " & Trim(sDrive) & " -s \"mkpart
primary linux-swap -" & lNeededSwap & "kb -1kb\"" WAIT ' partition 2
+ SHELL "mkswap " & Trim(sDrive) & (iLastPartNo
+ 2) WAIT ' make the swap partition
+ EXEC ["swapon", Trim(sDrive) & (iLastPartNo +
2)] WAIT
+ sSwapPart = Trim(sdrive) & (iLastPartNo + 2)
+ END IF
sRootPart = Trim(sdrive) & (iLastPartNo + 1)
- sSwapPart = Trim(sdrive) & (iLastPartNo + 2)
+
' Ready to start setting defined target partitions.
'###################################################################################################################
@@ -262,13 +273,26 @@
SHELL "parted " & Trim(sDrive) & " -s \"mkpart
primary reiserfs " & lFreeStart & "kb " & (lFreeEnd - lNeededSwap) & "kb\""
WAIT 'iLastpart + 1 partition
EXEC ["mkfs.reiserfs", "-fq", sDrive &
(iLastPartNo + 1)] WAIT
PRINT " --- Created / partition preformatted
to reiserfs " & Trim(sdrive) & (iLastPartNo + 1)
+
+ SHELL "probepart | grep -i \"linux swap\"| cut -f 1
-d \' \'" TO sDump
+ sDump = Trim(sDump) ' this is possibly an array
+ IF sDump THEN
+ sDumparr = Split(sDump, "\n")
+ PRINT " ---+ Use existing swap partition -> " &
sDumparr[0]
+ sSwapPart = Trim(sDumparr[0])
+
+
+ ELSE
+
+
SHELL "parted " & Trim(sdrive) & " -s \"mkpart
primary linux-swap " & (lFreeEnd - lNeededSwap) & "kb " & lFreeEnd & "kb\""
WAIT ' ilastpart + 2 partitiong
PRINT " --- Created swap partition " &
Trim(sdrive) & (iLastPartNo + 2)
SHELL "mkswap " & Trim(sdrive) & (iLastPartNo +
2) WAIT
SHELL "swapon " & Trim(sdrive) & (iLastPartNo +
2) WAIT
-
- sRootPart = Trim(sdrive) & (iLastPartNo + 1)
sSwapPart = Trim(sdrive) & (iLastPartNo + 2)
+ END IF
+ sRootPart = Trim(sdrive) & (iLastPartNo + 1)
+
ELSE ' this method skips one number I think
' BEGIN BY CREATING AN EXTENDED PARTITION TO HOLD
LOGICAL PARTITIONS IN IT
@@ -291,7 +315,18 @@
SHELL "parted " & Trim(sDrive) & " -s \"mkpart
logical reiserfs " & lFreeStart & "kb " & (lFreeEnd - lNeededSwap) & "kb\""
WAIT
'SHELL "echo yes | parted " & Trim(sdrive) & "
mkfs reiserfs " & (iLastPartNo + 2) WAIT
SHELL "mkfs.reiserfs -fq " & sDrive &
(iLastPartNo + 2) WAIT
-
+
+ ' search for existing swap partitions
+ SHELL "probepart | grep -i \"linux swap\"| cut -f 1
-d \' \'" TO sDump
+ sDump = Trim(sDump) ' this is possibly an array
+ IF sDump THEN
+ sDumparr = Split(sDump, "\n")
+ PRINT " ---+ Use existing swap partition -> " &
sDumparr[0]
+ sSwapPart = Trim(sDumparr[0])
+
+
+ ELSE
+
' ####################### 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)
@@ -312,8 +347,10 @@
' ' ' ' ' "EOF"
' ' ' ' ' File.Save("/tmp/swapmaker", sDump)
' ' ' ' ' SHELL "sh /tmp/swapmaker" WAIT
+ sSwapPart = Trim(sdrive) & (iLastPartNo + 3)
+ END IF
sRootPart = Trim(sdrive) & (iLastPartNo + 2)
- sRootPart = Trim(sdrive) & (iLastPartNo + 3)
+
END IF
END IF
@@ -324,8 +361,22 @@
' set the flag for partition reading
ClsGlobal.bAutoPartition = TRUE
- ClsGlobal.sTargetRoot = sRootPart
- ClsGlobal.sTargetSwap = sSwapPart
+
+ sPart = Left(sRootPart, Len("/dev/hda"))
+ sNum = Right(sRootPart, Len(sRootPart) - Len(sPart))
+
+ ' get the size of the / partition that was just created.
+ SHELL "parted " & sPart & " unit GB print | grep \"^ " & sNum & "\"
| tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump
+
+ sDump = Trim(sDump)
+ ClsGlobal.sTargetRoot = sRootPart & "-" & Trim(sDump)
+
+ ' get the size of the swap partition that was just created.
+ sPart = Left(sSwapPart, Len("/dev/hda"))
+ sNum = Right(sSwapPart, Len(sSwapPart) - Len(sPart))
+ SHELL "parted " & sPart & " unit GB print | grep \"^ " & sNum & "\"
| tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump
+ sDump = Trim(sDump)
+ ClsGlobal.sTargetSwap = sSwapPart & "-" & Trim(sDump)
@@ -336,13 +387,17 @@
PUBLIC FUNCTION GETNEXT() AS String
-
+ RETURN "Step7"
END
PUBLIC SUB STARTUP()
- 'ME.LIST_FREE_SPACE()
+
DIM i AS Integer
+
+ objTargetOptions = NEW Object[]
+ ME.LIST_FREE_SPACE()
+
FOR EACH RadioButton1 IN objTargetOptions
IF RadioButton1.Enabled = TRUE THEN INC i
NEXT
@@ -362,6 +417,7 @@
PUBLIC SUB ONEXIT()
' CREATE THE PARTITIONS NOW
+ ME.PERFORM_PARTITIONING()
END
@@ -374,6 +430,6 @@
PUBLIC SUB Form_Menu()
- ME.PERFORM_PARTITIONING()
+ 'ME.PERFORM_PARTITIONING()
END
Modified: branches/speedy/Step5.class
==============================================================================
--- branches/speedy/Step5.class (original)
+++ branches/speedy/Step5.class Wed Feb 25 14:08:32 2009
@@ -29,6 +29,9 @@
PUBLIC SUB StartUp()
ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
+ ME.tlEmbDone.Visible = FALSE
+ ME.tlEmbDone.Parent.Visible = FALSE
+ ME.Embedder1.Visible = TRUE
ME.EMBED_GPARTED()
END
@@ -62,6 +65,14 @@
IF Exist("/usr/sbin/gparted") = FALSE THEN
Message.Error(("Gparted was not found on this system. Please install
gparted and try again"))
+ ME.tlEmbDone.Text = "<b>" & ("Unable to launch partitioning tool.")
& "</b>" & "<br><br>" &
+ ("The gparted program was not found on this system. Please install
gparted or choose another partitioning method.")
+ ClsGlobal.fRunningMainForm.btnext.Enabled = FALSE
+ Embedder1.Visible = FALSE
+ tlEmbDone.Parent.Visible = TRUE
+ tlEmbDone.Visible = TRUE
+
+
RETURN
END IF
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Wed Feb 25 14:08:32 2009
@@ -42,10 +42,11 @@
WITH ME.TreeView1
.Add("DistroInfo", ("Distribution"), MdlStartUp.pCategory)
- .Add("Distro0", ("Name"), PicInfo, "DistroInfo")
- .Add("Distro00", Trim(ClsGlobal.sDistroName),, "Distro0")
- .Add("Distro1", ("Version"), PicInfo, "DistroInfo")
- .Add("Distro10", Trim(ClsGlobal.sDistroVer),, "Distro1")
+ .Add("Distro0", ClsGlobal.sDistroName & Space(1) &
ClsGlobal.sDistroVer, PicInfo, "DistroInfo")
+ '.Add("Distro0", ("Name"), PicInfo, "DistroInfo")
+ '.Add("Distro00", Trim(ClsGlobal.sDistroName),, "Distro0")
+ '.Add("Distro1", ("Version"), PicInfo, "DistroInfo")
+ '.'Add("Distro10", Trim(ClsGlobal.sDistroVer),, "Distro1")
END WITH
END
@@ -59,6 +60,7 @@
WITH ME.TreeView1
.Add("Part", ("Partitions to be used"), MdlStartUp.pCategory)
+ IF ClsGlobal.bAutoPartition = FALSE THEN
sArr = Split(ClsGlobal.sVitalPartList, ",")
FOR i = 0 TO sArr.Max
sList = Trim(sArr[i])
@@ -93,7 +95,14 @@
.Add("Swaps" & i, Left(sSwap, InStr(sSwap, "-") - 1) &
Space(1) & " -- " & Right(sSwap, Len(sSwap) - InStr(sSwap, "-")),
PicDisk, "Swaps")
END IF
NEXT
-
+ ELSE ' AUTOMATIC PARTITIONING SELECTED
+ 'Message("Automatic partition selection")
+ .Add("Part1", Replace(ClsGlobal.sTargetRoot, "-", " -- "),
PicDisk, "Part")
+ .Add("Part1.1", ("Pre-formatted to reiserfs, and used for /"),
PicTask, "Part1")
+ .Add("Swaps", ("Swap Space"),, "Part")
+ .Add("Swaps1", Replace(ClsGlobal.sTargetSwap, "-", " -- "),
PicDisk, "Swaps")
+ '.Add("Swaps1.1",
+ END IF
END WITH
END
@@ -152,11 +161,25 @@
END
+
+PUBLIC SUB Expand_Tree()
+
+ ME.TreeView1["DistroInfo"].Expanded = TRUE
+ ME.TreeView1["Part"].Expanded = TRUE
+ ME.TreeView1["Install Type"].Expanded = TRUE
+ IF ME.TreeView1.Exist("Software") THEN
+ ME.TreeView1["Software"].Expanded = TRUE
+ END IF
+
+END
+
+
PUBLIC SUB StartUp()
ME.TreeView1.Clear()
ME.SUMMARIZE_DISTRO_INFO()
ME.SUMMARIZE_PARTITION_SELECTION()
ME.SUMMARIZE_INSTALL_TYPE()
+ ME.Expand_Tree()
END
|
