Author: M0...@gm...
Date: Tue Dec 9 12:09:07 2008
New Revision: 382
Modified:
branches/iVL/.project
branches/iVL/FrmUserAdd.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlNetConf.module
branches/iVL/installer.gambas
Log:
- Fixed stalling @ end of installer
- Disabled wireless configuration from the installer (wired still active)
- Updated binary
- Prepare for beta 2.1 bugfix release
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 9 12:09:07 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.12
+Version=0.1.13
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Tue Dec 9 12:09:07 2008
@@ -317,7 +317,7 @@
.btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)
.pbUsrPic.Move(.btgrpHelp.Left, .btgrpHelp.Top + .btgrpHelp.Height + 2)
.frmUserList.Move(iListLeft, iListTop, 160, iListBottom - iListTop)
- .LstUsers.Move(4, 16, 150, .frmUserList.Height - (.LstUsers.Top) *
1.25)
+ .LstUsers.Move(4, 16, 150, .frmUserList.Height - (.LstUsers.Top) * 1.5)
' .LstUsers.Move(iListLeft, iListTop, 150, iListBottom - iListTop)
icby = 16
@@ -408,7 +408,7 @@
IF Key.text = Space(1) THEN
tbUsername.Text = Replace(tbUsername.text, Space(1), "")
END IF
-
+FMain.btnext.Enabled = TRUE
END
PUBLIC SUB btBrowse_Enter()
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Dec 9 12:09:07 2008
@@ -346,6 +346,7 @@
File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)
EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "config-vinstall-ng"] WAIT
+
SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "init"] WAIT
@@ -361,16 +362,17 @@
"Enjoy AND happy Vectoring...\" \n" &
"$DCMD --backtitle \"$BACKTITLE\" --title \"CONGRATULATIONS\" " &
"--msgbox \"$TEXT\" 0 0 2>/dev/NULL \n" &
+ "cd / && sh /var/log/scripts/x11-fonts* \n " &
"/sbin/vxconf \n" &
"#/sbin/config-stage1 gui-installer" & gb.NewLine
File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2",
sOut)
- EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "init"
&/ "config-stage2"] WAIT
+ EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "init" &/ "config-stage2"] WAIT
IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") THEN KILL
ClsGlobal.sTargetMnt &/ "tmp" &/ "status"
IF Exist("/tmp/status") THEN KILL "/tmp/status"
-hBgConfigProc = SHELL "chroot /mnt/target
/var/log/setup/config-vinstall-ng ; echo Done > /tmp/status" ' FOR READ"
+hBgConfigProc = SHELL "chroot /mnt/target
/var/log/setup/init/config-vinstall-ng ; echo Done > /tmp/status" ' FOR
READ"
'FrmDone.tmBgMon.Enabled = TRUE
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Tue Dec 9 12:09:07 2008
@@ -73,7 +73,8 @@
objIntTypes = NEW Object[]
- SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo
\"$res\" | tr -s \' \'" TO seths
+ 'SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo
\"$res\" | tr -s \' \'" TO seths
+ SHELL "ifconfig -a | grep ^[a-z]|grep -v ^lo | tr -s \' \'\"\"" TO
seths
'File.Save(Temp("eths"), Trim(seths))
'Message(File.Load(Temp("eths")))
@@ -133,7 +134,8 @@
ELSE
sStatus = ("Unplugged")
END IF
-
+
+ IF sType <> ("Wireless") THEN
WITH FrmNetConf.TSNetDevices
PRINT .Count
@@ -327,22 +329,23 @@
END WITH
-
+ 'END IF
END IF
END WITH
-
+ END IF
NEXT
FrmNetConf.TSNetDevices[FrmNetConf.TSNetDevices.count - 1].Delete ' Ugly
hack to delete the trailing blank tab
IF ERROR THEN Message(Error.text & gb.newline & Error.where)
- KILL "/tmp/iwdump"
- MdlCore.warn_status_off()
+ IF Exist("/tmp/iwdump") THEN KILL "/tmp/iwdump"
+ MdlCore.warn_status_off()
+
END
@@ -612,8 +615,6 @@
Message.Error(Error.where & gb.NewLine & Error.text)
END
-
-
PUBLIC SUB SET_DNS_ADDRESSES()
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
