Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r40 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-07-15 05:40:52
|
Author: M0E.lnx
Date: Mon Jul 14 22:39:55 2008
New Revision: 40
Modified:
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/FrmPartSel.class
branches/iVL/MdlPartSel.module
branches/iVL/MdlSetup.module
Log:
Added Win partition detection. TODO: Move win partition listing to
another screen, away from the *needed* partition listing
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Mon Jul 14 22:39:55 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/new-inst/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Mon Jul 14 22:39:55 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/new-inst/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Mon Jul 14 22:39:55 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/new-inst/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Mon Jul 14 22:39:55 2008
@@ -55,7 +55,7 @@
PUBLIC SUB Form_Hide()
-
+ ME.ANALYZE_PARTITION_SETUP()
END
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Mon Jul 14 22:39:55 2008
@@ -167,6 +167,7 @@
ClsPartSel.sSwap = sPart
END WITH
+
' now create a combobox with the swap-only option
cb = NEW ComboBox(FrmPartSel.scrollPartitions) AS "swapsel"
WITH cb
@@ -185,6 +186,72 @@
'Message.Info("Swap total = " & iswapsize)
END IF
+ ' now, do the WIN partitions
+ ' MOVE THESE PARTITIONS TO A DIFFERENT WINDOW.
+ ' THESE ARE ONLY NEEDED FOR FSTAB
+ sDump1 = ""
+ 'FIX THIS COMMAND.... MAY NOT WORK OR NEED MORE ACCURATE DETECTION
+ SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -i \" FAT\" |
cut -f 1 -d \' \'" TO sDump1
+ IF sDump1 THEN
+ sDump1 = Trim(sDump1)
+ y = y + tl.Height * 2 + 4
+ ' create a new text label just to label the separation between
windows and linux partitions
+ tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "Separator"
+ WITH tl
+ .Text = "<b>Windows Partitions</b>"
+ .Height = 27
+ .Width = MdlObjSizer.get_object_width(.Text)
+ .x = FrmPartSel.tlPartRow2.Left
+ .y = y
+ END WITH
+ END IF
+ IF InStr(sDump1, gb.NewLine) THEN ' more than one partition found
+ sPartList = Split(sDump1, gb.NewLine)
+ FOR i = 0 TO sPartList.Count - 1
+ sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))
+
+ SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " &
Trim(sPartList[i]) & Space(1) & "/mnt" &/ sPart WAIT
+ ' get the size using df -h | grep sPart and some sed
+ ' will embed some bash, but should probabbly be fixed
+ SHELL "export " & sPart & "=$(df -h | grep " & sPart
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
+ SHELL "sudo umount /mnt" &/ spart
+ SHELL "sudo rm -rf /mnt" &/ spart
+
+ tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "WinPartitions"
+ WITH tl
+ .Width = tl.Width
+ .Text = sPart & " ( " & sSize & " )"
+ .Tag = sPartList[i]
+ .Height = 27
+ .x = FrmPartSel.tlPartRow.Left
+ .y = y
+ END WITH
+ y = y + tl.Height + 4
+
+ NEXT
+ ELSE ' only one win partition found
+
+ sPart = Right(sDump1, Len(sDump1) - RInStr(sDump1, "/"))
+ SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " &
Trim(sDump1) & Space(1) & "/mnt" &/ sPart WAIT
+ SHELL "export " & sPart & "=$(df -h | grep " & sPart & ") &&
echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
+
+
+
+ y = y + tl.Height + 4
+ tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "WinPartitions"
+ WITH tl
+ .Width = lbwidth
+ .Text = sDump1 & " ( " & sSize & " )"
+ .tag = sDump1
+ .Height = 27
+ .x = FrmPartSel.tlPartRow.Left
+ .y = y
+
+ END WITH
+ SHELL "sudo umount /mnt" &/ spart WAIT
+ SHELL "sudo rm -rf /mnt" &/ spart WAIT
+ END IF
+
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Mon Jul 14 22:39:55 2008
@@ -79,25 +79,14 @@
SHELL "mkfs." & LCase(ClsPartSel.fRoot) & " || echo \'ERROR\'" TO sDump
- ' IF hproc.State = Process.Running THEN
- ' REPEAT
- ' WAIT
- ' UNTIL
- ' hproc.state = Process.Stopped
- ' ' do the error checking
- ' END IF
+
GOTO CHECK_OUTPUT
IF ClsPartSel.sHome AND ClsPartSel.fhome <> "Do not format" THEN
sDump = ""
SHELL "mkfs." & LCase(ClsPartSel.fhome) & " || echo \'ERROR\'" TO sDump
- ' IF hproc.State = Process.Running THEN
- ' REPEAT
- ' WAIT
- ' UNTIL
- ' hproc.state = Process.Stopped
- ' END IF
+
GOTO CHECK_OUTPUT
END IF
@@ -106,49 +95,28 @@
IF ClsPartSel.sOpt AND ClsPartSel.fOpt <> "Do not format" THEN
sDump = ""
SHELL "mkfs." & LCase(ClsPartSel.fOpt) & " || echo \'ERROR\'" TO sDump
- ' IF hproc.State = Process.Running THEN
- ' REPEAT
- ' WAIT
- ' UNTIL
- ' hproc.state = Process.Stopped
- ' END IF
-
+
GOTO CHECK_OUTPUT
END IF
IF ClsPartSel.sUsr AND ClsPartSel.fUsr <> "Do not format" THEN
sDump = ""
SHELL "mkfs." & LCase(ClsPartSel.fUsr) & " || echo \'ERROR\'" TO sDump
- ' IF hproc.State = Process.Running THEN
- ' REPEAT
- ' WAIT
- ' UNTIL
- ' hproc.State = Process.Stopped
- ' END IF
+
GOTO CHECK_OUTPUT
END IF
IF ClsPartSel.sVar AND ClsPartSel.fVar <> "Do not format" THEN
sDump = ""
SHELL "mkfs." & LCase(ClsPartSel.fVar) & " || echo \'ERROR\'" TO sDump
- ' IF hproc.State = Process.Running THEN
- ' REPEAT
- ' WAIT
- ' UNTIL
- ' hproc.State = Process.Stopped
- ' END IF
+
GOTO CHECK_OUTPUT
END IF
IF ClsPartSel.sTmp AND ClsPartSel.fTmp <> "Do not format" THEN
sDump = ""
SHELL "mkfs." & LCase(ClsPartSel.fTmp) & " || echo \'FAILED\'"
TO sDump
- ' IF hproc.state = Process.Running THEN
- ' REPEAT
- ' WAIT
- ' UNTIL
- ' hproc.state = Process.Stopped
- ' END IF
+
GOTO CHECK_OUTPUT
END IF
@@ -168,7 +136,7 @@
' this is where we need to set the mount target
ClsGlobal.sTargetMnt = "/mnt/target"
- IF Exist(ClsGlobal.sTargetMnt)FALSE THEN
+ IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
END IF
@@ -210,9 +178,6 @@
END
-
-
-
PUBLIC FUNCTION WRITE_NEW_FSTAB()
@@ -258,13 +223,10 @@
END IF
sFstab = sFstab & "\n\n" &
-"# Shared Windows/Linux partition"
+"# Shared Windows/Linux partition" &
"#/dev/hda1 /mnt/dos msdos umask=0 0 0 \n" &
"#/dev/hda1 /mnt/win vfat
fmask=111,dmask=0,quiet,shortname=mixed,user 0 0 \n" &
"#/dev/hda1 /mnt/win ntfs umask=0 0 0\n" &
-' Add any windows partitions to the fstab file
-' fix me here please
-
"# Floppy disks \n" &
"# The 'noauto' option indicates that the file system should not be
mounted \n" &
"# with 'mount -a' 'user' indicates that normal users are allowed to
mount \n" &
@@ -274,9 +236,9 @@
"# If you have a ls-120 floppy drive, it could be on /dev/hda b c d
etc.\n" &
"#/dev/hdd /mnt/ls120 auto defaults,noauto,user 0 0 \n\n" &
"# CDROM, CDWRITER, DVD \n" &
-"/dev/cdrom /mnt/cdrom iso9660 defaults,noauto,ro,user 0 0 \n" &
-"#/dev/cdwriter /mnt/cdwriter iso9660 defaults,noauto,rw,user 0 0
\n" &
-"#/dev/dvd /mnt/dvd auto defaults,noauto,ro,user 0 0\n\n" &
+"/dev/cdrom /media/cdrom iso9660 defaults,noauto,ro,user 0 0 \n" &
+"#/dev/cdwriter /media/cdwriter iso9660 defaults,noauto,rw,user 0 0
\n" &
+"#/dev/dvd /media/dvd auto defaults,noauto,ro,user 0 0\n\n" &
"# NFS file systems:\n" &
"#linux01.gwdg.de:/suse/6.3/i386.de /mnt/nfs nfs defaults 0 0\n\n" &
"# proc file system:\n" &
@@ -290,7 +252,6 @@
"usbfs /proc/bus/usb usbfs rw,devmode=0666 0 0\n\n" &
"# example of a VFAT USB pendrive\n" &
"#/dev/sda1 /mnt/pendrive vfat
fmask=111,dmask=0,noauto,user,quiet,shortname=mixed 0 0\n\n" &
-
"# Swap partitions\n" &
"# The 'sw' option means auto activating with 'swapon -a'.\n"
IF ClsPartSel.sSwap THEN
@@ -311,14 +272,18 @@
END
PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String
- SELECT CASE LCase(sFrmt)
+ DIM sMntOpts AS String
+
+ SELECT CASE LCase(sType)
CASE "reiserfs"
sMntOpts = "noatime"
CASE "vfat"
sMntOpts = "fmask=111,dmask=0,gid=users,shortname=mixed,quiet,user"
CASE "ntfs"
sMntOpts = "umask=0,gid=users,user"
- CASE "ext2", "ext3", ELSE
+ CASE "ext2", "ext3"
+ sMntOpts = "defaults"
+ CASE ELSE
sMntOpts = "defaults"
END SELECT
|
