Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r258 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-04 18:42:29
|
Author: M0E.lnx
Date: Tue Nov 4 10:40:55 2008
New Revision: 258
Added:
branches/iVL/FrmDone.class
branches/iVL/FrmDone.form
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/FMain.class
branches/iVL/FMain.form
branches/iVL/FrmXconf.class
branches/iVL/FrmXconf.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlNetConf.module
branches/iVL/MdlXconf.module
Log:
Implented quiet X configuration instead of full blown x configurator
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Nov 4 10:40:55 2008
@@ -66,39 +66,39 @@
msgid "No"
msgstr ""
-#: FMain.class:382
+#: FMain.class:389
msgid "has been installed on your computer. Additional system
configuration"
msgstr ""
-#: FMain.class:382
+#: FMain.class:389
msgid "will take place after you reboot your system.Part of this process
must be done in text mode."
msgstr ""
-#: FMain.class:382
+#: FMain.class:389
msgid "Would you like to reboot your computer now?"
msgstr ""
-#: FMain.class:387
+#: FMain.class:394
msgid "The VectorLinux installer will now exit. Enjoy your new operating
system"
msgstr ""
-#: FMain.class:454
+#: FMain.class:474
msgid "Process Overview"
msgstr ""
-#: FMain.class:474
+#: FMain.class:495
msgid "Next"
msgstr ""
-#: FMain.class:480
+#: FMain.class:501
msgid "Back"
msgstr ""
-#: FMain.class:486
+#: FMain.class:507
msgid "Exit Installation"
msgstr ""
-#: FMain.class:502
+#: FMain.class:523
msgid "Button1"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 4 10:40:55 2008
@@ -331,6 +331,13 @@
MdlNetConf.SET_DNS_ADDRESSES()
MdlNetConf.WRITE_INET()
+
+ ' CONFIGURE X QUIETLY HERE
+ MdlXconf.QUIET_XORG_CONFIGURATION()
+
+ frmNext = FrmDone
+
+ CASE "FrmDone"
'offer to reboot here
ME.END_INSTALLER()
frmNext = FrmAlsaConf
@@ -426,5 +433,18 @@
MdlCore.frmInit = FrmSelISO
MdlCore.main
+
+END
+
+PUBLIC SUB tvPlan_MouseDown()
+
+ tvPlan.MoveLast()
+ RETURN
+
+END
+
+PUBLIC SUB tvPlan_Click()
+
+STOP EVENT
END
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Tue Nov 4 10:40:55 2008
@@ -9,6 +9,7 @@
{ tvPlan TreeView
MoveScaled(1,2,22,56)
Expand = True
+ Mode = Select.None
Border = False
}
}
Added: branches/iVL/FrmDone.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmDone.class Tue Nov 4 10:40:55 2008
@@ -0,0 +1,30 @@
+' 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()
+
+ FMain.FrmCurr = ME
+
+ tlbanner.text = "<b>" & tlbanner.text & "</b>"
+ WITH ME.tlMsg
+ .Text = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
+ ("After reboot you can use vasm or vasmCC to fine tune your
installation.")
+ END WITH
+
+END
Added: branches/iVL/FrmDone.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmDone.form Tue Nov 4 10:40:55 2008
@@ -0,0 +1,25 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,79,52)
+ Text = ("")
+ Arrangement = Arrange.Vertical
+ { tlBanner TextLabel
+ MoveScaled(0,0,25,3)
+ Text = ("Installation is finished")
+ }
+ { Separator1 Separator
+ MoveScaled(0,3,31,1)
+ }
+ { PnlMsg Panel
+ MoveScaled(1,5,74,24)
+ Expand = True
+ Arrangement = Arrange.Horizontal
+ { tlMsg TextLabel
+ MoveScaled(1,2,67,16)
+ Expand = True
+ AutoResize = True
+ Text = ("")
+ }
+ }
+}
Modified: branches/iVL/FrmXconf.class
==============================================================================
--- branches/iVL/FrmXconf.class (original)
+++ branches/iVL/FrmXconf.class Tue Nov 4 10:40:55 2008
@@ -86,134 +86,134 @@
END
-PUBLIC SUB LIST_KBD_LAYOUTS()
-
- DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
- DIM i, ii AS Integer
- DIM sArr AS String[] '= Split(sFile, "\n")
- DIM sHack AS String
-
- ' ugly hack to get a good list begins here
- sHack = "#!/bin/bash \n" &
- "echo /dev/null > /tmp/kbd.file \n" &
- "while read code desc1 desc2 junk \n" &
- "do \n" &
- "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >> /tmp/kbd.file \n"
&
- "done < /etc/X11/xkb/rules/xorg.lst"
-
- File.Save("/tmp/kbd_strip.sh", sHack)
- SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
- SHELL "sh /tmp/kbd_strip.sh" WAIT
-
- ' END OF UGLY HACK HERE
-
- sFile = File.Load("/tmp/kbd.file")
- sarr = Split(sFile, "\n")
-
-
- ii = 1
- FOR i = 0 TO sArr.count - 1
- 'PRINT sArr[i]
- 'IF Left(sArr[i], Len("! Layout")) = "! Layout" THEN
- IF Left(sArr[i]) = "!" AND InStr(sArr[i], "layout") THEN
- 'REPEAT
- IF Trim(sarr[i + ii]) <> "" THEN
- REPEAT
- 'PRINT sarr[i + ii]
- ME.cvKbLayout.Add(Left(sarr[i + ii], InStr(sarr[i +
ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i +
ii], " ")))
- INC ii
- 'END IF
- UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "variant")
= TRUE
- END IF
-END IF
- NEXT
-
-
-
-END
-
-PUBLIC SUB LIST_KBD_VARIANTS()
-
- DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
- DIM i, ii AS Integer
- DIM sArr AS String[] '= Split(sFile, "\n")
-
-
-
- sFile = File.Load("/tmp/kbd.file")
- sarr = Split(sFile, "\n")
-
-
- ii = 1
- FOR i = 0 TO sArr.count - 1
- 'PRINT sArr[i]
- 'IF Left(sArr[i], Len("! Layout")) = "! Layout" THEN
- IF Left(sArr[i]) = "!" AND InStr(sArr[i], "variant") THEN
- 'REPEAT
- IF Trim(sarr[i + ii]) <> "" THEN
- REPEAT
- 'PRINT sarr[i + ii]
- ME.cvKbdVar.Add(Left(sarr[i + ii], InStr(sarr[i + ii], ":")),
Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i + ii], ":")))
- INC ii
- 'END IF
- UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "option") =
TRUE
- END IF
-END IF
- NEXT
-
-END
-
-
-
-PUBLIC SUB LIST_KBD_MODELS()
-
- DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
- DIM i, ii AS Integer
- DIM sArr AS String[] '= Split(sFile, "\n")
- 'DIM sHack AS String
-
- ' ' ugly hack to get a good list begins here
- ' sHack = "#!/bin/bash \n" &
- ' "echo /dev/null > /tmp/kbd.file \n" &
- ' "while read code desc1 desc2 junk \n" &
- ' "do \n" &
- ' "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >> /tmp/kbd.file
\n" &
- ' "done < /etc/X11/xkb/rules/xorg.lst"
- '
- ' File.Save("/tmp/kbd_strip.sh", sHack)
- ' SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
- ' SHELL "sh /tmp/kbd_strip.sh" WAIT
-
- ' END OF UGLY HACK HERE
-
- sFile = File.Load("/tmp/kbd.file")
- sarr = Split(sFile, "\n")
-
-
- ii = 1
- FOR i = 0 TO sArr.count - 1
- 'PRINT sArr[i]
- 'IF Left(sArr[i], Len("! Layout")) = "! Layout" THEN
- IF Left(sArr[i]) = "!" AND InStr(sArr[i], "model") THEN
- 'REPEAT
- IF Trim(sarr[i + ii]) <> "" THEN
- REPEAT
- 'PRINT sarr[i + ii]
- ME.cvKeybdModel.add(Left(sarr[i + ii], InStr(sarr[i +
ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i +
ii], " ")))
- INC ii
- 'END IF
- UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "layout") =
TRUE
- END IF
-END IF
- NEXT
-
-
-
-END
-
-
-
-
+' ' ' ' ' ' ' PUBLIC SUB LIST_KBD_LAYOUTS()
+' ' ' ' ' ' '
+' ' ' ' ' ' ' DIM sFile AS String '=
File.Load("/etc/X11/xkb/rules/xorg.lst")
+' ' ' ' ' ' ' DIM i, ii AS Integer
+' ' ' ' ' ' ' DIM sArr AS String[] '= Split(sFile, "\n")
+' ' ' ' ' ' ' DIM sHack AS String
+' ' ' ' ' ' '
+' ' ' ' ' ' ' ' ugly hack to get a good list begins here
+' ' ' ' ' ' ' sHack = "#!/bin/bash \n" &
+' ' ' ' ' ' ' "echo /dev/null > /tmp/kbd.file \n" &
+' ' ' ' ' ' ' "while read code desc1 desc2 junk \n" &
+' ' ' ' ' ' ' "do \n" &
+' ' ' ' ' ' ' "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >>
/tmp/kbd.file \n" &
+' ' ' ' ' ' ' "done < /etc/X11/xkb/rules/xorg.lst"
+' ' ' ' ' ' '
+' ' ' ' ' ' ' File.Save("/tmp/kbd_strip.sh", sHack)
+' ' ' ' ' ' ' SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
+' ' ' ' ' ' ' SHELL "sh /tmp/kbd_strip.sh" WAIT
+' ' ' ' ' ' '
+' ' ' ' ' ' ' ' END OF UGLY HACK HERE
+' ' ' ' ' ' '
+' ' ' ' ' ' ' sFile = File.Load("/tmp/kbd.file")
+' ' ' ' ' ' ' sarr = Split(sFile, "\n")
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' ii = 1
+' ' ' ' ' ' ' FOR i = 0 TO sArr.count - 1
+' ' ' ' ' ' ' 'PRINT sArr[i]
+' ' ' ' ' ' ' 'IF Left(sArr[i], Len("! Layout")) = "! Layout"
THEN
+' ' ' ' ' ' ' IF Left(sArr[i]) = "!" AND InStr(sArr[i], "layout") THEN
+' ' ' ' ' ' ' 'REPEAT
+' ' ' ' ' ' ' IF Trim(sarr[i + ii]) <> "" THEN
+' ' ' ' ' ' ' REPEAT
+' ' ' ' ' ' ' 'PRINT sarr[i + ii]
+' ' ' ' ' ' ' ME.cvKbLayout.Add(Left(sarr[i + ii],
InStr(sarr[i + ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) -
InStr(sarr[i + ii], " ")))
+' ' ' ' ' ' ' INC ii
+' ' ' ' ' ' ' 'END IF
+' ' ' ' ' ' ' UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i +
ii], "variant") = TRUE
+' ' ' ' ' ' ' END IF
+' ' ' ' ' ' ' END IF
+' ' ' ' ' ' ' NEXT
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' END
+' ' ' ' ' ' '
+' ' ' ' ' ' ' PUBLIC SUB LIST_KBD_VARIANTS()
+' ' ' ' ' ' '
+' ' ' ' ' ' ' DIM sFile AS String '=
File.Load("/etc/X11/xkb/rules/xorg.lst")
+' ' ' ' ' ' ' DIM i, ii AS Integer
+' ' ' ' ' ' ' DIM sArr AS String[] '= Split(sFile, "\n")
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' sFile = File.Load("/tmp/kbd.file")
+' ' ' ' ' ' ' sarr = Split(sFile, "\n")
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' ii = 1
+' ' ' ' ' ' ' FOR i = 0 TO sArr.count - 1
+' ' ' ' ' ' ' 'PRINT sArr[i]
+' ' ' ' ' ' ' 'IF Left(sArr[i], Len("! Layout")) = "! Layout"
THEN
+' ' ' ' ' ' ' IF Left(sArr[i]) = "!" AND InStr(sArr[i], "variant") THEN
+' ' ' ' ' ' ' 'REPEAT
+' ' ' ' ' ' ' IF Trim(sarr[i + ii]) <> "" THEN
+' ' ' ' ' ' ' REPEAT
+' ' ' ' ' ' ' 'PRINT sarr[i + ii]
+' ' ' ' ' ' ' ME.cvKbdVar.Add(Left(sarr[i + ii], InStr(sarr[i
+ ii], ":")), Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i +
ii], ":")))
+' ' ' ' ' ' ' INC ii
+' ' ' ' ' ' ' 'END IF
+' ' ' ' ' ' ' UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i +
ii], "option") = TRUE
+' ' ' ' ' ' ' END IF
+' ' ' ' ' ' ' END IF
+' ' ' ' ' ' ' NEXT
+' ' ' ' ' ' '
+' ' ' ' ' ' ' END
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' PUBLIC SUB LIST_KBD_MODELS()
+' ' ' ' ' ' '
+' ' ' ' ' ' ' DIM sFile AS String '=
File.Load("/etc/X11/xkb/rules/xorg.lst")
+' ' ' ' ' ' ' DIM i, ii AS Integer
+' ' ' ' ' ' ' DIM sArr AS String[] '= Split(sFile, "\n")
+' ' ' ' ' ' ' 'DIM sHack AS String
+' ' ' ' ' ' '
+' ' ' ' ' ' ' ' ' ugly hack to get a good list begins here
+' ' ' ' ' ' ' ' sHack = "#!/bin/bash \n" &
+' ' ' ' ' ' ' ' "echo /dev/null > /tmp/kbd.file \n" &
+' ' ' ' ' ' ' ' "while read code desc1 desc2 junk \n" &
+' ' ' ' ' ' ' ' "do \n" &
+' ' ' ' ' ' ' ' "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >>
/tmp/kbd.file \n" &
+' ' ' ' ' ' ' ' "done < /etc/X11/xkb/rules/xorg.lst"
+' ' ' ' ' ' ' '
+' ' ' ' ' ' ' ' File.Save("/tmp/kbd_strip.sh", sHack)
+' ' ' ' ' ' ' ' SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
+' ' ' ' ' ' ' ' SHELL "sh /tmp/kbd_strip.sh" WAIT
+' ' ' ' ' ' '
+' ' ' ' ' ' ' ' END OF UGLY HACK HERE
+' ' ' ' ' ' '
+' ' ' ' ' ' ' sFile = File.Load("/tmp/kbd.file")
+' ' ' ' ' ' ' sarr = Split(sFile, "\n")
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' ii = 1
+' ' ' ' ' ' ' FOR i = 0 TO sArr.count - 1
+' ' ' ' ' ' ' 'PRINT sArr[i]
+' ' ' ' ' ' ' 'IF Left(sArr[i], Len("! Layout")) = "! Layout"
THEN
+' ' ' ' ' ' ' IF Left(sArr[i]) = "!" AND InStr(sArr[i], "model") THEN
+' ' ' ' ' ' ' 'REPEAT
+' ' ' ' ' ' ' IF Trim(sarr[i + ii]) <> "" THEN
+' ' ' ' ' ' ' REPEAT
+' ' ' ' ' ' ' 'PRINT sarr[i + ii]
+' ' ' ' ' ' ' ME.cvKeybdModel.add(Left(sarr[i + ii],
InStr(sarr[i + ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) -
InStr(sarr[i + ii], " ")))
+' ' ' ' ' ' ' INC ii
+' ' ' ' ' ' ' 'END IF
+' ' ' ' ' ' ' UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i +
ii], "layout") = TRUE
+' ' ' ' ' ' ' END IF
+' ' ' ' ' ' ' END IF
+' ' ' ' ' ' ' NEXT
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' END
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
PUBLIC SUB Form_Resize()
@@ -234,9 +234,9 @@
PUBLIC SUB Form_Menu()
- ME.LIST_KBD_LAYOUTS
- ME.LIST_KBD_MODELS
- ME.LIST_KBD_VARIANTS
+' ME.LIST_KBD_LAYOUTS
+' ME.LIST_KBD_MODELS
+' ME.LIST_KBD_VARIANTS
END
@@ -261,5 +261,11 @@
PUBLIC SUB cvKbLayout_Click()
Message(LAST.current.key)
+
+END
+
+PUBLIC SUB Form_MouseDown()
+
+
END
Modified: branches/iVL/FrmXconf.form
==============================================================================
--- branches/iVL/FrmXconf.form (original)
+++ branches/iVL/FrmXconf.form Tue Nov 4 10:40:55 2008
@@ -13,81 +13,42 @@
}
}
{ Panel1 Panel
- MoveScaled(0,6,98,10)
- Arrangement = Arrange.Horizontal
+ MoveScaled(0,7,98,31)
AutoResize = True
- { Frame1 Frame
- MoveScaled(2,0,85,9)
- Expand = True
+ { tlSetupMethod TextLabel
+ MoveScaled(0,0,13,3.4286)
+ Text = ("Video Driver")
+ Alignment = Align.Normal
+ }
+ { tlChoiceExp TextLabel
+ MoveScaled(0,4,35,3)
Text = ("")
- { tlChoiceExp TextLabel
- MoveScaled(1,5,35,3)
- Text = ("")
- }
- { cbSetupMethod ComboBox
- MoveScaled(14,1,22,3)
- Text = ("Vesa")
- ReadOnly = True
- List = [("Vesa"), ("Fbdev")]
- }
- { tlSetupMethod TextLabel
- MoveScaled(1,1,13,3)
- Text = ("Video Driver")
- Alignment = Align.Normal
- }
- { tlColorDepth TextLabel
- MoveScaled(42,1,11,3)
- Text = ("Color Depth")
- Alignment = Align.Normal
- }
- { cbColorDepth ComboBox
- MoveScaled(52,1,24,3)
- Text = ("")
- List = [("24 bit True Color"), ("16 bit Pseudo Color"), ("8 bit
256 Color"), ("4 bit 16 Color"), ("1 bit Mono B/W")]
- }
- { tlScreenRes TextLabel
- MoveScaled(42,4,18,3)
- Text = ("Screen Resolution")
- Alignment = Align.Normal
- }
- { cbScreenRes ComboBox
- MoveScaled(60,4,16,3)
- Text = ("")
- List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
- }
- }
- }
- { pblKbdSets Panel
- MoveScaled(1,17,96,27)
- Expand = True
- Arrangement = Arrange.Horizontal
- AutoResize = True
- { frmkbdlay Frame
- MoveScaled(0,0,30,25)
- Expand = True
- Text = ("Keyboard Layout")
- { cvKbLayout ColumnView
- MoveScaled(1,3,28,20)
- Expand = True
- }
- }
- { frmKbdMod Frame
- MoveScaled(33,0,32,24)
- Expand = True
- Text = ("Keyboard Model")
- { cvKeybdModel ColumnView
- MoveScaled(1,3,29,21)
- Expand = True
- }
- }
- { frmkeyVar Frame
- MoveScaled(67,1,27,23)
- Expand = True
- Text = ("Keyboard Variant")
- { cvKbdVar ColumnView
- MoveScaled(8,3,11,21)
- Expand = True
- }
+ }
+ { tlColorDepth TextLabel
+ MoveScaled(0,9,11,3)
+ Text = ("Color Depth")
+ Alignment = Align.Normal
+ }
+ { tlScreenRes TextLabel
+ MoveScaled(0,12,18,3)
+ Text = ("Screen Resolution")
+ Alignment = Align.Normal
+ }
+ { cbColorDepth ComboBox
+ MoveScaled(10,9,24,3)
+ Text = ("")
+ List = [("24 bit True Color"), ("16 bit Pseudo Color"), ("8 bit 256
Color"), ("4 bit 16 Color"), ("1 bit Mono B/W")]
+ }
+ { cbSetupMethod ComboBox
+ MoveScaled(13,0,22,3.4286)
+ Text = ("Vesa")
+ ReadOnly = True
+ List = [("Vesa"), ("Fbdev")]
+ }
+ { cbScreenRes ComboBox
+ MoveScaled(18,12,16,3)
+ Text = ("")
+ List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
}
}
}
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Nov 4 10:40:55 2008
@@ -128,6 +128,7 @@
'IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
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")
@@ -262,18 +263,18 @@
"read-only" & " \n \n"
ENDIF
- FOR EACH cbox IN MdlPartSel.oMountPoints
- IF cbox.text = "/" AND bInc.tag = cbox.tag THEN
- IF MdlLiloOsList.bVlCliOption = TRUE THEN
- 'IF bInc.tag = ClsPartSel.sRoot AND MdlLiloOsList.bVlCliOption =
TRUE THEN
- sCliSection = Replace(sSection, "append = \"" & sEntryApnd
& "\"", "append = \"2 " & sEntryApnd & "\"") 'splash=silent\"")
- sCliSection = Replace(sCliSection, "label = " &
sEntryLbl, "label = " & sEntryLbl & "-tui")
- sCliSection = sCliSection & gb.NewLine
+ 'FOR EACH cbox IN MdlPartSel.oMountPoints
+ ' IF cbox.text = "/" AND cbox.tag = ClsPartSel.sRoot THEN
+ ' IF MdlLiloOsList.bVlCliOption = TRUE THEN
+ IF bInc.tag = ClsPartSel.sRoot AND MdlLiloOsList.bVlCliOption =
TRUE THEN
+ sCliSection = Replace(sSection, "append = \"" &
sEntryApnd & "\"", "append = \"2 " & sEntryApnd & "\"") 'splash=silent\"")
+ sCliSection = Replace(sCliSection, "label = " &
sEntryLbl, "label = " & sEntryLbl & "-tui")
+ sCliSection = sCliSection & gb.NewLine
ELSE
- sCliSection = ""
+ sCliSection = ""
END IF
- END IF
- NEXT
+ 'END IF
+ 'NEXT
ELSE
sSection = ""
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Tue Nov 4 10:40:55 2008
@@ -484,10 +484,6 @@
END
-
-
-
-
PUBLIC SUB OsList_click()
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Tue Nov 4 10:40:55 2008
@@ -568,11 +568,11 @@
"# By the way, Arnt Gulbrandsen <agr...@nv...> says that
127.0.0.1 should NEVER \n" &
"# be named with the name of the machine. It causes problem sor some
programs, irc and \n" &
"# reputedly talk. :^) \n#\n#\n" &
- "# For loopbacking." &
+ "# For loopbacking. \n" &
"127.0.0.1" & Space(5) & "localhost" & "\n" &
"#\n#\n" &
"# This next entry is technically wrong, but good enough to get TCP/IP
applications to quit complaining \n" &
- "# that they can\'t clarify the hostname on a loopback-only system
\n#\n#\n#" &
+ "# that they can\'t clarify the hostname on a loopback-only system
\n#\n#\n# \n" &
"127.0.0.1" & Space(5) & sHostName & Space(5) & sHostName & "\n#\n#" &
"# End of hosts."
Modified: branches/iVL/MdlXconf.module
==============================================================================
--- branches/iVL/MdlXconf.module (original)
+++ branches/iVL/MdlXconf.module Tue Nov 4 10:40:55 2008
@@ -15,9 +15,10 @@
' 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 LIST_KBD_LAYOUT()
+PUBLIC SUB QUIET_XORG_CONFIGURATION()
- ' Read /etc/X11/xkb/rules/xorg.lst
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " X -configure :2" WAIT
+ IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "X11" &/ "xorg.conf") THEN
MOVE ClsGlobal.sTargetMnt &/ "etc" &/ "X11" &/ "xorg.conf" TO
ClsGlobal.sTargetMnt &/ "etc" &/ "X11" &/ "xorg.conf.dist"
+ COPY ClsGlobal.sTargetMnt &/ "root" &/ "xorg.conf.new" TO
ClsGlobal.sTargetMnt &/ "etc" &/ "X11" &/ "xorg.conf"
END
|
