Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r536 - - Finished services step.
|
From: <cod...@go...> - 2009-04-17 19:38:55
|
Author: M0...@gm...
Date: Fri Apr 17 12:07:23 2009
New Revision: 536
Added:
branches/speedy/FDone.class
branches/speedy/FDone.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step6.pot
branches/speedy/Conf0.class
branches/speedy/Conf1.class
branches/speedy/Conf2.class
branches/speedy/Conf4.class
branches/speedy/Conf5.class
branches/speedy/Conf5.form
branches/speedy/MdlStartUp.module
branches/speedy/Step1.class
branches/speedy/Step6.class
Log:
- Finished services step.
- Updated navigation indicators
- Fixed bug in partition selection reading.
- Added final Step
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Apr 17 12:07:23 2009
@@ -54,82 +54,82 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:332 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:336 Step1.class:453 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:395
+#: Conf0.class:399
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:411
+#: Conf0.class:415
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:420
+#: Conf0.class:424
msgid "LILO"
msgstr ""
-#: Conf0.class:426
+#: Conf0.class:430
msgid "GRUB"
msgstr ""
-#: Conf0.class:432
+#: Conf0.class:436
msgid "NONE"
msgstr ""
-#: Conf0.class:441
+#: Conf0.class:445
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:451
+#: Conf0.class:455
msgid "Target"
msgstr ""
-#: Conf0.class:463
+#: Conf0.class:467
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:482
+#: Conf0.class:486
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:493
+#: Conf0.class:497
msgid "Seconds"
msgstr ""
-#: Conf0.class:499
+#: Conf0.class:503
msgid "Boot Default"
msgstr ""
-#: Conf0.class:518
+#: Conf0.class:522
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:534
+#: Conf0.class:538
msgid "Tab 0"
msgstr ""
-#: Conf1.class:141 MdlStartUp.module:53
+#: Conf1.class:145 MdlStartUp.module:53
msgid "Regional Settings"
msgstr ""
-#: Conf1.class:154
+#: Conf1.class:158
msgid ""
"Choose how\n"
"your hardware clock is set up.\n"
@@ -138,19 +138,19 @@
"Choose localtime since most PCs are setup this way."
msgstr ""
-#: Conf1.class:170
+#: Conf1.class:174
msgid "Choose the correct timezone for the area in which you live."
msgstr ""
-#: Conf1.class:181
+#: Conf1.class:185
msgid "ComboBox1"
msgstr ""
-#: Conf1.class:183
+#: Conf1.class:187
msgid "LocalTime"
msgstr ""
-#: Conf1.class:183
+#: Conf1.class:187
msgid "UTC"
msgstr ""
@@ -180,27 +180,27 @@
msgid "DO NOT LEAVE THIS BLANK"
msgstr ""
-#: Conf2.class:58
+#: Conf2.class:60
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: Conf2.class:64
+#: Conf2.class:66
msgid "Password was not set. See error log below"
msgstr ""
-#: Conf2.class:132
+#: Conf2.class:134
msgid "System Administrator Account"
msgstr ""
-#: Conf2.class:149
+#: Conf2.class:151
msgid "About the linux root account"
msgstr ""
-#: Conf2.class:181
+#: Conf2.class:183
msgid "Enter Passwrord"
msgstr ""
-#: Conf2.class:198 Conf3.class:380
+#: Conf2.class:200 Conf3.class:380
msgid "Re-enter Password"
msgstr ""
@@ -384,78 +384,108 @@
msgid "Cancel"
msgstr ""
-#: Conf4.class:68 MdlStartUp.module:55
+#: Conf4.class:70 MdlStartUp.module:55
msgid "Network Settings"
msgstr ""
-#: Conf5.class:59
+#: Conf5.class:61
msgid "Service"
msgstr ""
-#: Conf5.class:88
+#: Conf5.class:90
msgid "System task scheduler"
msgstr ""
-#: Conf5.class:91
+#: Conf5.class:93
msgid "Bluetooth device manager"
msgstr ""
-#: Conf5.class:94
+#: Conf5.class:96
msgid "Secure Shell remote access"
msgstr ""
-#: Conf5.class:97
+#: Conf5.class:99
msgid "Software update notifications"
msgstr ""
-#: Conf5.class:100
+#: Conf5.class:102
msgid "Wireless network scanner"
msgstr ""
-#: Conf5.class:103
+#: Conf5.class:105
msgid "Printing service"
msgstr ""
-#: Conf5.class:106
+#: Conf5.class:108
msgid "File in userspace daemon"
msgstr ""
-#: Conf5.class:109
+#: Conf5.class:111
msgid "Internet Super Server"
msgstr ""
-#: Conf5.class:112
+#: Conf5.class:114
msgid "RPC Port Mapper"
msgstr ""
-#: Conf5.class:115
+#: Conf5.class:117
msgid "Windows networking service"
msgstr ""
-#: Conf5.class:118
+#: Conf5.class:120
msgid "VMWare modules"
msgstr ""
-#: Conf5.class:121
+#: Conf5.class:123
msgid "Network interface manager"
msgstr ""
-#: Conf5.class:124
+#: Conf5.class:126
msgid "Enhanced network security"
msgstr ""
-#: Conf5.class:127
+#: Conf5.class:129
msgid "Mouse driver for Text Mode interface"
msgstr ""
-#: Conf5.class:202
+#: Conf5.class:228
msgid "System Services"
msgstr ""
-#: Conf5.class:223
+#: Conf5.class:249
msgid "Select the system services to be launched at start-up."
msgstr ""
+#: FDone.class:23 FMain.class:317 FMain0.class:318
+msgid "Next"
+msgstr ""
+
+#: FDone.class:31
+msgid "VectorLinux has been installed in your system."
+msgstr ""
+
+#: FDone.class:31
+msgid ""
+"After your computer restarts, you may use VasmCC to perform any
additional "
+"configuration."
+msgstr ""
+
+#: FDone.class:31 Step1.class:98 Step2.class:198 Step5.class:177
+msgid "Click"
+msgstr ""
+
+#: FDone.class:31
+msgid "to restart your computer now."
+msgstr ""
+
+#: FDone.class:73
+msgid "Installation Complete"
+msgstr ""
+
+#: FDone.class:90
+msgid "About your VectorLinux installation"
+msgstr ""
+
#: FMain.class:253 FMain0.class:253
msgid "Process Overview"
msgstr ""
@@ -468,10 +498,6 @@
msgid "Back"
msgstr ""
-#: FMain.class:317 FMain0.class:318
-msgid "Next"
-msgstr ""
-
#: FMain.class:328 FMain0.class:329
msgid "Quit"
msgstr ""
@@ -670,10 +696,6 @@
msgid "to search for media again"
msgstr ""
-#: Step1.class:98 Step2.class:198 Step5.class:177
-msgid "Click"
-msgstr ""
-
#: Step1.class:98
msgid "to begin installing"
msgstr ""
@@ -706,47 +728,47 @@
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:222
+#: Step1.class:223
msgid "Scanning"
msgstr ""
-#: Step1.class:232
+#: Step1.class:242
msgid "in"
msgstr ""
-#: Step1.class:260
+#: Step1.class:270
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:353
+#: Step1.class:373
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:356
+#: Step1.class:376
msgid "VERSION"
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:443
+#: Step1.class:463
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:511
+#: Step1.class:531
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:550
+#: Step1.class:570
msgid "Search Again"
msgstr ""
-#: Step1.class:580
+#: Step1.class:600
msgid "Check Installation media before installing"
msgstr ""
@@ -999,11 +1021,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:540 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:540 Step7a.class:143
msgid "No"
msgstr ""
@@ -1296,7 +1318,7 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:405
+#: Step6.class:433
msgid "Select which partitions to use for installation"
msgstr ""
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Fri Apr 17 12:07:23 2009
@@ -54,71 +54,71 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "WARNING:"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:395
+#: Conf0.class:399
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:411
+#: Conf0.class:415
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:420
+#: Conf0.class:424
msgid "LILO"
msgstr ""
-#: Conf0.class:426
+#: Conf0.class:430
msgid "GRUB"
msgstr ""
-#: Conf0.class:432
+#: Conf0.class:436
msgid "NONE"
msgstr ""
-#: Conf0.class:441
+#: Conf0.class:445
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:451
+#: Conf0.class:455
msgid "Target"
msgstr ""
-#: Conf0.class:463
+#: Conf0.class:467
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:482
+#: Conf0.class:486
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:493
+#: Conf0.class:497
msgid "Seconds"
msgstr ""
-#: Conf0.class:499
+#: Conf0.class:503
msgid "Boot Default"
msgstr ""
-#: Conf0.class:518
+#: Conf0.class:522
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:534
+#: Conf0.class:538
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Fri Apr 17 12:07:23 2009
@@ -74,51 +74,51 @@
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:222
+#: Step1.class:223
msgid "Scanning"
msgstr ""
-#: Step1.class:232
+#: Step1.class:242
msgid "in"
msgstr ""
-#: Step1.class:260
+#: Step1.class:270
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:353
+#: Step1.class:373
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:356
+#: Step1.class:376
msgid "VERSION"
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "WARNING:"
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:443
+#: Step1.class:463
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:511
+#: Step1.class:531
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:550
+#: Step1.class:570
msgid "Search Again"
msgstr ""
-#: Step1.class:580
+#: Step1.class:600
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Fri Apr 17 12:07:23 2009
@@ -58,15 +58,15 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:405
+#: Step6.class:433
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:510
+#: Step6.class:540
msgid "Yes"
msgstr ""
-#: Step6.class:510
+#: Step6.class:540
msgid "No"
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Fri Apr 17 12:07:23 2009
@@ -232,6 +232,10 @@
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step5"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step4"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step6"].picture = MdlStartUp.pNow
+
RETURN "Conf1"
END
Modified: branches/speedy/Conf1.class
==============================================================================
--- branches/speedy/Conf1.class (original)
+++ branches/speedy/Conf1.class Fri Apr 17 12:07:23 2009
@@ -23,10 +23,14 @@
' default the time zone to us/central
ME.lbTmZone[ME.lbTmZone.Find("US/Central")].Selected = TRUE
+
END
PUBLIC FUNCTION GetNext() AS String
+
+ ClsGlobal.fRunningMainForm.listview1["Step6"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step7"].picture = MdlStartUp.pNow
RETURN "Conf2"
Modified: branches/speedy/Conf2.class
==============================================================================
--- branches/speedy/Conf2.class (original)
+++ branches/speedy/Conf2.class Fri Apr 17 12:07:23 2009
@@ -34,6 +34,8 @@
END
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step7"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step8"].picture = MdlStartUp.pNow
RETURN "Conf3"
Modified: branches/speedy/Conf4.class
==============================================================================
--- branches/speedy/Conf4.class (original)
+++ branches/speedy/Conf4.class Fri Apr 17 12:07:23 2009
@@ -26,6 +26,8 @@
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step8"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pNow
RETURN "Conf5"
Modified: branches/speedy/Conf5.class
==============================================================================
--- branches/speedy/Conf5.class (original)
+++ branches/speedy/Conf5.class Fri Apr 17 12:07:23 2009
@@ -26,6 +26,8 @@
END
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step10"].picture = MdlStartUp.pNow
RETURN "FDone"
END
@@ -36,7 +38,7 @@
END
PUBLIC SUB OnExit()
-
+ ME.SAVE_SERVICES_LIST()
END
@@ -159,7 +161,7 @@
PUBLIC SUB gvSvcList_Click()
- IF LAST.column > 0 THEN RETURN
+ IF LAST.column > 1 THEN RETURN
IF gvSvcList[LAST.row, 0].Picture = picStatus THEN
gvSvcList[LAST.row, 0].Picture = ""
ELSE
@@ -167,5 +169,29 @@
END IF
gvSvcList.Refresh()
+
+END
+PUBLIC SUB SAVE_SERVICES_LIST()
+
+ DIM irow AS Integer
+ DIM sSVc AS String
+
+ ' We will default to runlevel 4 (GUI Mode) for services.
+ FOR irow = 0 TO ME.gvSvcList.Rows.Count - 1
+ sSVc = gvSvcList[irow, 3].Text
+ IF gvSvcList[irow, 0].Picture = picStatus THEN
+ PRINT " \\__ Setting up services" & gb.NewLine
+ PRINT " \\- " & sSVc
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /sbin/service -s " &
sSVc & " 4" WAIT
+ END IF
+
+ NEXT
+
+END
+
+
+PUBLIC SUB gvSvcList_Menu()
+
+ ME.SAVE_SERVICES_LIST()
END
Modified: branches/speedy/Conf5.form
==============================================================================
--- branches/speedy/Conf5.form (original)
+++ branches/speedy/Conf5.form Fri Apr 17 12:07:23 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,94,47)
+ MoveScaled(0,0,92,59)
Text = ("")
Arrangement = Arrange.Row
Padding = 2
Added: branches/speedy/FDone.class
==============================================================================
--- (empty file)
+++ branches/speedy/FDone.class Fri Apr 17 12:07:23 2009
@@ -0,0 +1,44 @@
+' 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/>.
+
+PUBLIC SUB Form_Open()
+
+ DIM sTxt AS String
+ IF ClsGlobal.fRunningMainForm THEN
+ sTxt = ClsGlobal.fRunningMainForm.btnext.text
+ ELSE
+ sTxt = ("Next")
+ END IF
+
+
+ WITH ME
+ .tlbanner.Text = "<h2>" & tlbanner.Text & "</h2>"
+ .TextLabel1.Text = ("VectorLinux has been installed in your system.")
& "<br><br>" &
+ "<br>" & ("After your computer restarts, you may use VasmCC to perform
any additional configuration.") & "<br>" & "<br>" &
+ ("Click") & Space(1) & "\"" & sTxt & "\"" & Space(1) & ("to restart
your computer now.")
+
+ END WITH
+
+ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pDone
+ClsGlobal.fRunningMainForm.listview1["Step10"].picture = MdlStartUp.pNow
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ ME.HBox2.Width = hbox2.Parent.Width - (hbox2.Left * 2)
+
+END
Added: branches/speedy/FDone.form
==============================================================================
--- (empty file)
+++ branches/speedy/FDone.form Fri Apr 17 12:07:23 2009
@@ -0,0 +1,39 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,82,49)
+ Text = ("")
+ Arrangement = Arrange.Row
+ Padding = 2
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("Installation Complete")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(1,6,8,5)
+ Expand = True
+ }
+ { Frame1 Frame
+ MoveScaled(1,9,78,31)
+ Expand = True
+ Text = ("About your VectorLinux installation")
+ { HBox2 HBox
+ MoveScaled(1,3,76,27)
+ Expand = True
+ { TextLabel1 TextLabel
+ MoveScaled(1,3,69,10)
+ Expand = True
+ Text = ("")
+ }
+ }
+ }
+}
Modified: branches/speedy/MdlStartUp.module
==============================================================================
--- branches/speedy/MdlStartUp.module (original)
+++ branches/speedy/MdlStartUp.module Fri Apr 17 12:07:23 2009
@@ -51,7 +51,7 @@
ClsGlobal.fRunningMainForm.listview1.add("Cat2", Space(3) & ("System
Configuration"), pCategory)
ClsGlobal.fRunningMainForm.listview1.add("Step6", ("System Boot
Manager"), pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step7", ("Regional Settings"),
pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Step8", ("User Accounts"),
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step8", ("User Accounts"),
pToDO)
ClsGlobal.fRunningMainForm.listview1.add("Step9", ("Network Settings"),
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step10", ("Startup Options"),
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step11", ("Final
Configuration"), pToDo)
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Fri Apr 17 12:07:23 2009
@@ -195,9 +195,9 @@
PUBLIC SUB FIND_CD_INSTALL_MEDIA()
DIM sDump, sDrive, sOutput, sShortDrive AS String
- DIM sName, sVersion AS String
+ DIM sName, sVersion, sMntPnt AS String
DIM i AS Integer
- DIM sDriveList AS String[]
+ DIM sDriveList, sDumparr AS String[]
ME.mvLooking.Playing = TRUE
WAIT 1
@@ -216,13 +216,23 @@
sDriveList = Split(sOutput, "\n")
FOR i = 0 TO sDriveList.Count - 1
sShortDrive = Right(Trim(sDriveList[i]), Len(Trim(sDriveList[i])) -
RInStr(Trim(sDriveList[i]), "/"))
- EXEC ["mkdir", "-p", "/mnt" &/ sShortDrive] WAIT
- 'EXEC ["mount", "-o", "ro", Trim(sDriveList[i]), "/mnt" &/
sShortDrive] WAIT
- SHELL "mount " & Trim(sDriveList[i]) & Space(1) & "/mnt" &/
sShortDrive & " 2>/dev/null" WAIT
+ sMntPnt = "/mnt" &/ sShortDrive
+ IF IsDir(sMntPnt) = FALSE THEN
+ EXEC ["mkdir", "-p", sMntPnt] WAIT
+ END IF
PRINT ("Scanning") & Space(1) & sDriveList[i]
- IF Exist("/mnt" &/ sShortDrive &/ "veclinux" &/ "VINSTALL.CONF")
THEN
- SHELL "grep \"^DISTRO=\" /mnt" &/ sShortDrive &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sName
- SHELL "grep \"^VERSION=\" /mnt" &/ sShortDrive &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sVersion
+ SHELL "mount | grep \"^" & Trim(sDriveList[i]) & "\" | cut -f 3
-d \' \'" TO sDump
+ sDump = Trim(sDump)
+ IF NOT (sDump) THEN
+ SHELL "mount " & Trim(sDriveList[i]) & Space(1) & sMntPnt
& " 2>/dev/null" WAIT
+ ELSE
+ sDumparr = Split(sDump, gb.NewLine)
+ sMntPnt = Trim(sDumparr[0])
+ END IF
+
+ IF Exist(sMntPnt &/ "veclinux" &/ "VINSTALL.CONF") THEN
+ SHELL "grep \"^DISTRO=\"" & sMntPnt &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sName
+ SHELL "grep \"^VERSION=\"" & sMntPnt &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sVersion
sName = Trim(Replace(sName, "\'", ""))
sVersion = Trim(Replace(sVersion, "\'", ""))
File.Save(Temp(sShortDrive), File.Load("/mnt" &/
sShortDrive &/ "veclinux" &/ "VINSTALL.CONF"))
@@ -247,10 +257,10 @@
PUBLIC SUB FIND_ISO_INSTALL_MEDIA()
- DIM sOutput, sPart, sISoName, sFile AS String
- DIM sName, sVersion AS String
+ DIM sOutput, sPart, sISoName, sFile, sDump AS String
+ DIM sName, sVersion, sMntPnt AS String
DIM i AS Integer
- DIM sPartList AS String[]
+ DIM sPartList, sDumparr AS String[]
ME.ComboBox1.Enabled = FALSE
@@ -265,11 +275,21 @@
sPartList = Split(sOutput, "\n")
FOR i = 0 TO sPartList.Count - 1
sPart = Trim(Right(Trim(sPartList[i]), Len(Trim(sPartList[i])) -
RInStr(Trim(sPartList[i]), "/")))
- EXEC ["mkdir", "/mnt" &/ Trim(sPart)] WAIT
- EXEC ["mount", "/dev" &/ Trim(sPart), "/mnt" &/ Trim(sPart)] WAIT
- FOR EACH sFile IN Dir("/mnt" &/ Trim(sPart), "*.iso")
+ sMntPnt = "/mnt" &/ sPart
+ IF IsDir(sMntPnt) = FALSE THEN
+ EXEC ["mkdir", "-p", sMntPnt] WAIT
+ END IF
+ SHELL "mount | grep \"^/dev" &/ Trim(spart) & "\" | cut -f 3
-d \' \'" TO sDump
+ sDump = Trim(sDump)
+ IF sDump THEN
+ sDumparr = Split(sDump, gb.NewLine)
+ sMntPnt = Trim(sDumparr[0])
+ ELSE
+ EXEC ["mount", "/dev" &/ Trim(sPart), sMntPnt] WAIT
+ END IF
+ FOR EACH sFile IN Dir(sMntPnt, "*.iso", gb.File)
TRY MKDIR "/mnt/loop"
- EXEC ["mount", "-o", "loop", "/mnt" &/ Trim(sPart) &/
Trim(sFile), "/mnt/loop"] WAIT
+ EXEC ["mount", "-o", "loop", sMntPnt &/
Trim(sFile), "/mnt/loop"] WAIT
IF Exist("/mnt/loop/veclinux/VINSTALL.CONF") THEN
'PRINT "Adding temp file" & Space(1) &
Temp(Trim(sFile) & "-" & Trim(sPart))
File.Save(Temp(Trim(sFile) & "-" & Trim(sPart)),
File.Load("/mnt/loop/veclinux/VINSTALL.CONF"))
@@ -282,9 +302,9 @@
NEXT
- EXEC ["umount", "/mnt" &/ Trim(sPart)] WAIT
+ EXEC ["umount", sMntPnt] WAIT
EXEC ["sync"] WAIT
- TRY RMDIR "/mnt" &/ Trim(sPart)
+ TRY RMDIR sMntPnt
'EXEC ["rm,", "-rf", "/mnt" &/ Trim(sPart)] WAIT
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Fri Apr 17 12:07:23 2009
@@ -255,12 +255,12 @@
'IF LAST.text = ("Swap") THEN RETURN
IF LAST.text <> ("Not Used") THEN
IF LAST.TEXT <> ("Swap") THEN
- IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
- LAST.text = ("Not Used")
- STOP EVENT
- RETURN
- END IF
- END IF
+ IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
+ LAST.text = ("Not Used")
+ STOP EVENT
+ RETURN
+ END IF
+ END IF
END IF
IF LAST.text <> ("Not Used") THEN
@@ -328,77 +328,27 @@
DIM sPart, sFormat, sSize, sMntPoint AS String
DIM i, irow AS Integer
-
- ' ================= get the list of vital partitions
=====================
- FOR irow = 2 TO gvPartListing.Rows.count - 1
- IF Trim(gvPartListing[irow, 2].Text) THEN
- IF Trim(gvPartListing[irow, 2].Text) <> ("Not Used") AND
Trim(gvPartListing[irow, 2].Text) <> ("Swap") THEN
+ FOR EACH cb IN ME.objMntPoints
+ IF cb.Text <> ("Not Used") THEN
+ FOR irow = 0 TO gvPartListing.Rows.Count - 1
sPart = Trim(gvPartListing[irow, 0].Text)
sSize = Trim(gvPartListing[irow, 1].Text)
sMntPoint = Trim(gvPartListing[irow, 2].Text)
sFormat = Trim(gvPartListing[irow, 4].Text)
-
- ' 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 & "|"
-
+ IF sPart = cb.Tag THEN ' we found a match.
+ IF cb.Text <> ("Swap") THEN
+ ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & sPart
& "-" & sSize & "-" & sMntPoint & "-" & sFormat & "|"
+ ELSE
+ ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & sPart
& "-" & sSize & "|"
+ END IF
END IF
- END IF
-
- NEXT
-
- ' =========== get list of swap partitions selected .(if any)
=====================
-
- FOR irow = 2 TO gvPartListing.Rows.count - 1
- IF Trim(gvPartListing[irow, 2].Text) = ("Swap") THEN
- sPart = Trim(gvPartListing[irow, 0].Text)
- sSize = Trim(gvPartListing[irow, 1].Text)
- ' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
- ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & spart & "-" &
sSize & "|"
+
+ NEXT
END IF
NEXT
-
-
- 'Message(ClsGlobal.sVitalPartList)
-'
-' FOR EACH cbox IN objMntPoints
-' IF cbox.Text <> ("Not Used") THEN
-' i = 2
-' REPEAT
-' IF Trim(gvPartListing[i, 0].Text) = Trim(cbox.Tag) THEN
-' sSize = Trim(gvPartListing[i, 1].Text)
-' END IF
-' INC i
-' UNTIL sSize OR i = gvPartListing.Rows.Count
-'
-' FOR EACH cb IN objFS
-' IF cbox.tag = cb.Tag THEN
-' sFormat = Trim(cb.Text)
-' BREAK
-' ELSE
-' sFormat = ""
-' END IF
-' NEXT
-' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag
& "-" & sSize & "-" & cbox.Text & "-" & sFormat & ","
-' END IF
-' NEXT
-'
-' FOR i = 2 TO gvPartListing.Rows.count - 1
-' IF gvPartListing[i, 4].Text LIKE "linux-swap" THEN
-' FOR EACH cbox IN objMntPoints
-' IF cbox.tag = gvPartListing[i, 0].Text THEN
-' IF cbox.text <> ("Not Used") THEN
-' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
-' END IF
-' END IF
-' NEXT
-' END IF
-' NEXT
-'
-'
+
END
-'
-'
+
PUBLIC SUB Form_Open()
@@ -445,4 +395,6 @@
cbYN.Visible = FALSE
END
+
+
|
