From: <cod...@go...> - 2008-11-13 21:24:45
|
Author: M0E.lnx Date: Thu Nov 13 13:23:40 2008 New Revision: 290 Modified: branches/iVL/FrmLiloSetup.class branches/iVL/FrmLiloSetup.form branches/iVL/MdlConfLilo.module branches/iVL/MdlLilo.module Log: Added top-form details to new LILO setup window Modified: branches/iVL/FrmLiloSetup.class ============================================================================== --- branches/iVL/FrmLiloSetup.class (original) +++ branches/iVL/FrmLiloSetup.class Thu Nov 13 13:23:40 2008 @@ -18,9 +18,19 @@ PUBLIC SUB Form_Open() + + ' hack just for testing here + ClsPartSel.sRoot = "/dev/hdb1" + ClsPartSel.fRoot = "reiserfs" + +MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS() +ME.list_video_modes() + + MdlLilo.LIST_LINUX_OS() MdlLilo.LIST_WIN_INSTALLS() ME.CLEANUP_TABSTRIP() + MdlLilo.LIST_DEFAULT_BOOT_OPTIONS() ' initial list END PUBLIC SUB CLEANUP_TABSTRIP() @@ -38,6 +48,22 @@ END + +PUBLIC SUB list_video_modes() + + WITH ME.cbVideoRes + .Add(("Standard")) + .Add(("Bootsplash Med")) + .Add(("Bootsplash High")) + .Add(("Bootsplash Extra High")) + END WITH + + +END + + + + PUBLIC SUB Form_Menu() Modified: branches/iVL/FrmLiloSetup.form ============================================================================== --- branches/iVL/FrmLiloSetup.form (original) +++ branches/iVL/FrmLiloSetup.form Thu Nov 13 13:23:40 2008 @@ -17,7 +17,7 @@ } } { Panel1 Panel - MoveScaled(2,8,84,3) + MoveScaled(2,8,84,4) Arrangement = Arrange.Horizontal { CheckBox1 CheckBox MoveScaled(0,0,20,3) @@ -37,10 +37,11 @@ { cbVideoRes ComboBox MoveScaled(61,0,22,3) Text = ("") + ReadOnly = True } } { Panel3 Panel - MoveScaled(1,11,88,3) + MoveScaled(1,12,88,4) Arrangement = Arrange.Horizontal { tlLiloTarget TextLabel MoveScaled(0,0,7,3) @@ -48,8 +49,9 @@ Alignment = Align.Normal } { cbLIloTarget ComboBox - MoveScaled(8,0,26,2) + MoveScaled(8,0,26,3) Text = ("") + ReadOnly = True } { Panel4 Panel MoveScaled(35,1,5,2) @@ -59,10 +61,12 @@ { cbDefBoot TextLabel MoveScaled(45,0,11,3) Text = ("Boot Default") + Alignment = Align.Normal } - { ComboBox1 ComboBox + { cbBootDefault ComboBox MoveScaled(62,0,22,3) Text = ("") + ReadOnly = True } } { PnlTop Panel @@ -90,7 +94,7 @@ } } { tsLIloTabs TabStrip - MoveScaled(2,25,84,30) + MoveScaled(2,23,84,30) Expand = True Index = 0 Text = ("Tab 0") Modified: branches/iVL/MdlConfLilo.module ============================================================================== --- branches/iVL/MdlConfLilo.module (original) +++ branches/iVL/MdlConfLilo.module Thu Nov 13 13:23:40 2008 @@ -119,39 +119,20 @@ SHELL "probedisk | grep -v cdrom |cut -f 1 -d \'|\'" TO sList sList = Trim(sList) - sListarr = Split(sList, "\n") + sListarr = Split(sList, "\n").Sort(gb.Ascent) FOR i = 0 TO sListarr.count - 1 sTarget = "MBR of " & Trim(sListarr[i]) - FrmLilo.LiloTarget.Add(sTarget) + 'FrmLilo.LiloTarget.Add(sTarget) + FrmLiloSetup.cbLIloTarget.Add(sTarget) NEXT - WITH FrmLilo.LiloTarget - 'IF LCase(ClsPartSel.fRoot) <> "xfs" THEN - 'IF Application.Args[1] <> "" THEN + 'WITH FrmLilo.LiloTarget + WITH FrmLiloSetup.cbLIloTarget + IF LCase(ClsPartSel.fRoot) <> "xfs" THEN + + .Add("Sector") + END IF - ' DETECT THE FILESYSTEM OF THE PARTITION BEING MOUNTED AS ROOT HERE - - - - ' ELSE - - FOR EACH cb IN MdlPartSel.oMountPoints - IF cb.text = "/" THEN - ClsPartSel.sRoot = cb.Tag ' make sure this is set... we will need it later - FOR EACH cb1 IN MdlPartSel.oFsTypes - IF cb1.tag = cb.tag THEN - IF cb1.text <> "xfs" THEN .Add("Sector") - END IF - NEXT - END IF - NEXT - - - 'END IF - - '.Add("Sector") -' END IF - SHELL "lsdev | grep floppy" TO sDump Modified: branches/iVL/MdlLilo.module ============================================================================== --- branches/iVL/MdlLilo.module (original) +++ branches/iVL/MdlLilo.module Thu Nov 13 13:23:40 2008 @@ -163,7 +163,7 @@ DIM sWinDrives AS String[] DIM i, ii AS Integer DIM sTmpMountPoint AS String = "/tmp/lilo_tmp" - + DIM hproc AS Process ME.arrWinBootChecks = NEW Object[] ME.arrWinNameTxtBoxes = NEW Object[] @@ -172,7 +172,12 @@ sWinDrives = Split(sWinPartlist, gb.NewLine) FOR i = 0 TO sWinDrives.Count - 1 sPartition = sWinDrives[i] - EXEC ["mount", sPartition, sTmpMountPoint] WAIT + hproc = EXEC ["mount", sPartition, sTmpMountPoint] WAIT + IF hproc.Value > 0 THEN + EXEC ["sync"] WAIT + EXEC ["umount", sPartition] WAIT + EXEC ["mount", sPartition, sTmpMountPoint] WAIT + END IF IF Exist(sTmpMountPoint &/ "winnt" &/ "system32" &/ "winver.exe") OR IF Exist(sTmpMountPoint &/ "WINDOWS" &/ "system32" &/ "winver.exe") THEN 'Message(sPartition & " has a windows install") WITH FrmLiloSetup.tsLIloTabs @@ -283,9 +288,7 @@ END IF 'Message(sInitrdLoc) - - ' hack just for testing here - ClsPartSel.sRoot = "/dev/hdb1" + INC i x = 4 y = 12 @@ -361,11 +364,11 @@ .Height = 21 .Tag = i & sHostPart ' BROWSE FOR INITRD IMAGES - FOR EACH sDump IN Dir(sInitrdLoc, "initrd*") + FOR EACH sDump IN Dir(sInitrdLoc, "initrd*").Sort(gb.Ascent) IF cbox.Find(Trim(sDump)) = -1 THEN cbox.Add(Trim(sDump)) NEXT - - .Sorted = TRUE + .Sorted = gb.Ascent + '.Sorted = TRUE END WITH ME.arrCbInitrds.Add(cbox) @@ -409,4 +412,36 @@ END + + +PUBLIC SUB LIST_DEFAULT_BOOT_OPTIONS() + + DIM cb, cbox AS CheckBox + DIM tb AS TextBox + + FOR EACH cb IN ME.arrLinuxIncCheckboxes + IF cb.Value = TRUE THEN + FOR EACH tb IN ME.arrLinuxNametxtboxes + IF tb.Tag = cb.Tag THEN + WITH FrmLiloSetup.cbBootDefault + IF .Find(tb.Text) = -1 THEN .Add(tb.Text) + END WITH + END IF + NEXT + FOR EACH cbox IN ME.arrLinuxTextBoots + IF cb.Tag = cbox.Tag THEN + IF cbox.Value = TRUE THEN + FOR EACH tb IN ME.arrLinuxNametxtboxes + IF cbox.Tag = tb.Tag THEN + IF FrmLiloSetup.cbBootDefault.Find(tb.Text & "-tui") = -1 THEN FrmLiloSetup.cbBootDefault.Add(tb.Text & "-tui") + END IF + NEXT + END IF + END IF + NEXT + END IF + NEXT + +END + |