Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r336 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-02 19:36:00
|
Author: M0E.lnx
Date: Tue Dec 2 11:32:28 2008
New Revision: 336
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FMain.form
branches/iVL/FrmImportAccts.class
branches/iVL/FrmImportAccts.form
branches/iVL/FrmResetSettings.class
branches/iVL/FrmResetSettings.form
branches/iVL/FrmUserAdd.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlResetSettings.module
branches/iVL/installer.gambas
Log:
Begin testing accounts import module
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -90,19 +90,19 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:797
+#: FMain.class:796
msgid "Back"
msgstr ""
-#: FMain.class:809
+#: FMain.class:807
msgid "Exit Installation"
msgstr ""
-#: FMain.class:821
+#: FMain.class:818
msgid "Next"
msgstr ""
-#: FMain.class:835
+#: FMain.class:832
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# 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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.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 Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Tue Dec 2 11:32:28 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Dec 2 11:32:28 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.11
+Version=0.1.12
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Tue Dec 2 11:32:28 2008
@@ -62,7 +62,6 @@
MoveScaled(3,41,53,3)
{ btback Button
MoveScaled(0,0,8,3)
- Expand = True
Text = ("Back")
Picture = Picture["icon:/16/left"]
}
@@ -72,7 +71,6 @@
}
{ btQuit Button
MoveScaled(16,0,15,3)
- Expand = True
Text = ("Exit Installation")
Picture = Picture["icon:/16/cancel"]
}
@@ -82,7 +80,6 @@
}
{ btnext Button
MoveScaled(44,0,8,3)
- Expand = True
Text = ("Next")
Picture = Picture["icon:/16/right"]
}
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Tue Dec 2 11:32:28 2008
@@ -15,6 +15,8 @@
' 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 sSettingsList AS String
+
PUBLIC SUB Form_Open()
WITH ME
@@ -54,12 +56,20 @@
PUBLIC SUB btcancel_Click()
- ME.Close()
+ FrmUserAdd.Reparent(FMain.pnlwinhost)
+ FrmUserAdd.Show()
+ ME.Hide()
+ 'ME.Close()
END
PUBLIC SUB btImportAccnt_Click()
+IF Len(Trim(ME.cbAccntList.Text)) = 0 THEN
+ Message(("Please select an account name from the dropdown list."))
+ RETURN
+END IF
+
IF ME.tbPass1.Text = "" OR ME.tbPass2.Text = "" THEN
Message.Error(("Password fields cannot be blank. Please enter a
password for") & Space(1) & ME.cbAccntList.Text)
RETURN
@@ -68,9 +78,13 @@
Message.Error(("Selected passwords dont match. Please enter the same
password twice"))
RETURN
ELSE
- ME.pbLogin.Delete
+ 'IF ME.pbLogin THEN ME.pbLogin.Delete
'pbLogin = NEW PictureBox(ME)
'me.pbLogin.Move(
+ ME.cbAccntList.Remove(ME.cbAccntList.Find(Trim(ME.cbAccntList.Text)))
+ ME.cbAccntList.Sorted = TRUE
+ 'RETURN
+ ME.CREATE_IMPORTED_ACCOUNT
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
'ME.Close
'ME.pbLogin.Picture.Image.Clear
@@ -79,6 +93,106 @@
END
+PUBLIC SUB CREATE_IMPORTED_ACCOUNT()
+ DIM sGroups AS String
+ DIM cb AS CheckBox
+ DIM sSettings AS String[]
+ DIM i AS Integer
+ DIM sPicdir AS String = ClsGlobal.sTargetMnt
&/ "usr/share/apps/kdm/pics/users/"
+ DIM tl AS TextLabel
+ DIM iTlY AS Integer
+
+ ' Prepare group list
+ FOR EACH cb IN MdlUsrAdd.objGrps
+ IF cb.Value = TRUE THEN
+ sGroups = sGroups & cb.Text & ","
+ END IF
+ NEXT
+ sGroups = Trim(sGroups)
+ sGroups = Left(sGroups, Len(sGroups) - 1)
+
+ 'Message(sGroups)
+ 'RETURN
+ ' Prepare home dir making the requested changes
+ IF Len(sSettingsList) > 0 THEN
+ sSettings = Split(sSettings, ",")
+ FOR i = 0 TO sSettings.Count - 1
+ EXEC ["rm", "-rf", ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
+ EXEC ["cp", "-r", ClsGlobal.sTargetMnt &/ "etc" &/ "skel" &
Trim(sSettings[i]), ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
+ EXEC ["chown", Trim(ME.cbAccntList.Text) & ":users",
ClsGlobal.sTargetMnt &/ "home" &/ Trim(ME.cbAccntList.Text) &/
Trim(sSettings[i])] WAIT
+ NEXT
+
+
+ END IF
+
+ SHELL "chroot /mnt/target /usr/sbin/groupdel " &
Trim(ME.cbAccntList.Text) WAIT
+ SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1) &
FrmUserAdd.iUID & Space(1) & Trim(ME.cbAccntList.Text) WAIT
+ SHELL "chroot /mnt/target /usr/sbin/useradd -g " & ME.tbUsername.text
& " -p " & ME.tbPasswd1.text & " -u " & FrmUserAdd.iUID & " -G "
& "\'users," & sGroups & "\' -s /bin/bash " & 'ME.tbUsername.Text WAIT
+ Trim(ME.cbAccntList.Text) & " -d /home/" & Trim(ME.cbAccntList.Text) WAIT
+ SHELL "chroot /mnt/target /sbin/passwdx " & Trim(ME.cbAccntList.Text) &
Space(1) & ME.tbPass1.Text WAIT
+
+ ' Add the face icon
+ IF Len(ME.tbPicPath.Text) > 0 THEN
+ SHELL "cd " & sPicdir & " && ln -s " &
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) &
Trim(ME.cbAccntList.Text) & ".face.icon" WAIT 'link for KDM
+ ' Tweak for the GDM face icon to work
+ COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ ".face"
+ SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
Trim(ME.cbAccntList.Text) &/ ".face" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home" &/ Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home/" & Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
+ END IF
+
+ ' Increase the value of the iUID
+ INC FrmUserAdd.iUID
+ ME.LIST_IMPORTED_USER_ACCOUNT()
+
+
+END
+
+ PUBLIC SUB LIST_IMPORTED_USER_ACCOUNT()
+ 'needs to verify with /etc/passwd to check for user account
+ DIM sFile AS String[] = Split(DConv(File.Load(clsglobal.sTargetMnt
&/ "etc" &/ "passwd")))
+ DIM arrline AS String[]
+ DIM i, ii, iUID AS Integer
+ DIM sLine, sSec, sUsrLogin, sUsrRlName, sUsrHome AS String
+ DIM vuid AS Variant
+ DIM tl AS TextLabel
+ DIM tly AS Integer
+
+ FrmUserAdd.LstUsers.Clear
+ tly = 4
+ FOR i = 0 TO sFile.count - 1
+ sLine = sFile[i]
+ ' now split each line
+ arrline = Split(sLine, ":")
+ FOR ii = 0 TO arrline.count - 1
+ sSec = Trim(arrline[ii])
+ vuid = arrline[2]
+ iUID = CInt(vuid)
+ sUsrLogin = arrline[0]
+ sUsrRlName = arrline[4]
+ sUsrHome = arrline[5]
+ NEXT
+ IF iUID >= 500 THEN
+ tl = NEW TextLabel(FrmUserAdd.LstUsers) AS "UserList"
+ WITH tl
+ .Height = 21
+ .Text = sUsrLogin
+ .Width = MdlObjSizer.get_object_width(.Text)
+ .ToolTip = sUsrRlName & "\n" & "<b>" & "USER ID: "
& "</b > " & iUid &
+ "<b>" & "HOME DIRECTORY: " & "</b>" & sUsrHome
+ .Move(0, tly)
+ END WITH
+ tly = tly + tl.Height + 2
+ END IF
+ NEXT
+
+
+
+
+END
+
+
+
PUBLIC SUB Form_Resize()
WITH ME
@@ -94,7 +208,20 @@
.btBrowsePic.Move(.ClientWidth - .btBrowsePic.Width - 8, .tlPicPath.top
+ .tlPicPath.Height + 8, MdlObjSizer.get_object_width(.btBrowsePic.Text) +
36)
.tbPicPath.Move(4, .btBrowsePic.top, (.ClientWidth - .btBrowsePic.Width)
- (.tbPicPath.Left * 2) - 8)
.pbLogin.Move(.tbPass2.Left + .tbPass2.Width + 8, .tlPasswd2.top + 4,
48, 48)
+ .scrGrpHost.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientWidth
- (.scrGrpHost.Left * 2), .ClientHeight - (.scrGrpHost.Top +
(.btBrowsePic.Height * 4)))
+ .btResetSettings.Move(4, .scrGrpHost.top + .scrGrpHost.Height + 8,
MdlObjSizer.get_object_width(.btResetSettings.Text) + 36)
+ .btImportAccnt.Move(4, .btResetSettings.top + .btResetSettings.Height +
4, MdlObjSizer.get_object_width(.btImportAccnt.Text) + 36)
+ .btcancel.Move(.btImportAccnt.Left + .btImportAccnt.Width +
4, .btImportAccnt.Top, MdlObjSizer.get_object_width(.btcancel.Text) + 36)
+
+ '.btResetSettings.Move(4,.scrGrpHost.top + .scrGrpHost.Height
+ '.frmUsrGrps.Move(4, .tbPicPath.top + .tbPicPath.Height +
4, .ClientWidth - (.frmUsrGrps.Left * 2))
'.btBrowsePic.Move(.ClientWidth - .btBrowsePic.Width - 8,.tbPass2.top
+ .tbPass1
END WITH
+
+END
+
+PUBLIC SUB cbAccntList_Click()
+
+' ME.pbLogin.Picture.Clear
END
Modified: branches/iVL/FrmImportAccts.form
==============================================================================
--- branches/iVL/FrmImportAccts.form (original)
+++ branches/iVL/FrmImportAccts.form Tue Dec 2 11:32:28 2008
@@ -47,29 +47,33 @@
MoveScaled(28,12,25,3)
Text = ("Verify Password")
}
- { ScrollView1 ScrollView
+ { scrGrpHost ScrollView
MoveScaled(1,26,66,18)
- Expand = True
+ Arrangement = Arrange.Horizontal
Border = False
{ frmUsrGrps Frame
MoveScaled(0,0,65,15)
+ Expand = True
Text = ("User Rights Management")
}
}
{ btResetSettings Button
MoveScaled(1,45,23,3)
- Text = ("Reset settings")
+ Text = ("Select Settings to reset")
Picture = Picture["icon:/small/undo"]
+ Border = False
}
{ btImportAccnt Button
MoveScaled(1,49,23,3)
Text = ("Import Account")
Picture = Picture["icon:/small/redo"]
+ Border = False
}
{ btcancel Button
MoveScaled(26,49,14,3)
Text = ("Cancel")
Picture = Picture["icon:/16/cancel"]
+ Border = False
}
{ tlBanner TextLabel
MoveScaled(0,0,43,3)
Modified: branches/iVL/FrmResetSettings.class
==============================================================================
--- branches/iVL/FrmResetSettings.class (original)
+++ branches/iVL/FrmResetSettings.class Tue Dec 2 11:32:28 2008
@@ -29,7 +29,7 @@
.Columns.count = 3
.Columns[0].Width = 32
.Columns[1].Width = 400
- .Columns[2].Width = 1
+ '.Columns[2].Width = 1
.Rows.Count = 1
END WITH
@@ -56,9 +56,27 @@
PUBLIC SUB btDone_Click()
+ME.GENERATE_LIST
ME.Close
END
+
+PUBLIC SUB GENERATE_LIST()
+
+ DIM I AS Integer
+ DIM sList AS String
+ FOR I = 0 TO ME.gvSettings.Rows.count - 1
+ IF gvSettings[i, 0].Picture = FrmPkgSel.pYes THEN sList = sList &
gvSettings[i, 2].Text & ","
+ NEXT
+' INC i
+sList = Left(Trim(sList), Len(Trim(sList)) - 1)
+'Message(sList)
+FrmImportAccts.sSettingsList = sList
+'Message(FrmImportAccts.sSettingsList)
+
+
+END
+
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmResetSettings.form
==============================================================================
--- branches/iVL/FrmResetSettings.form (original)
+++ branches/iVL/FrmResetSettings.form Tue Dec 2 11:32:28 2008
@@ -3,6 +3,8 @@
{ Form Form
MoveScaled(0,0,69,35)
Text = ("")
+ Icon = Picture["icon:/small/undo"]
+ SkipTaskbar = True
{ tlBanner TextLabel
MoveScaled(1,1,40,3)
Text = ("Select which settings to reset")
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Tue Dec 2 11:32:28 2008
@@ -45,10 +45,10 @@
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
- ' .FrmCurr = ME
- ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
- ' .tvPlan["Conf3"].Selected = TRUE
+ .FrmCurr = ME
+ .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf3"].picture = MdlCore.sNowPic
+ .tvPlan["Conf3"].Selected = TRUE
END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
@@ -141,7 +141,6 @@
'Message(sGroups)
SHELL "chroot /mnt/target /usr/sbin/groupdel " &
ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
- 'SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & iUID &
Space(1) & ME.tbUsername.Text WAIT
PRINT "Creating new user group"
SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1)
& iUID & Space(1) & ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
@@ -162,7 +161,7 @@
'this next line is for kdm
SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
'the next lines are for gdm
- PRINT tbPicPath.Text
+ 'PRINT tbPicPath.Text
'SHELL "cp " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home" &/
tbUsername.text &/ ".face"
SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
@@ -430,5 +429,12 @@
' .tvPlan["Conf3"].picture = MdlCore.sNowPic
' .tvPlan["Conf3"].Selected = TRUE
' END WITH
+
+END
+
+PUBLIC SUB btImportAcct_Click()
+
+ FrmImportAccts.Reparent(FMain.pnlwinhost)
+ ME.Hide()
END
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Dec 2 11:32:28 2008
@@ -304,7 +304,7 @@
IF Exist("/lib" &/ "modules" &/ Trim(sarch)) = FALSE THEN
' running hosted install detected
TRY MKDIR "/lib" &/ "modules" &/ Trim(sarch)
- SHELL "mount -o bind /mnt/target/lib/modules" &/ Trim(sarch) & "
/lib/modules" &/ Trim(sarch)" && depmod -aq"
+ SHELL "mount -o bind /mnt/target/lib/modules" &/ Trim(sarch) & "
/lib/modules" &/ Trim(sarch) & " && depmod -aq"
END IF
Modified: branches/iVL/MdlResetSettings.module
==============================================================================
--- branches/iVL/MdlResetSettings.module (original)
+++ branches/iVL/MdlResetSettings.module Tue Dec 2 11:32:28 2008
@@ -17,12 +17,18 @@
PUBLIC pYes AS Picture
PUBLIC SUB LIST_RESETABLE_SETTINGS()
- DIM sFile, sDesc AS String
+ DIM sFile, sDesc, sSkellPath, stargetPath AS String
DIM i AS Integer
+
+ 'ClsGlobal.sTargetMnt = "/"
+ 'sSkellPath = ClsGlobal.sTargetMnt &/ "etc" &/ "skel"
+ sSkellPath = "/etc/skel"
+ stargetPath = User.Home
+ 'stargetPath = ClsGlobal.sTargetMnt &/ "home" &/
Trim(FrmImportAccts.cbAccntList.Text)
i = 0
pYes = FrmPkgSel.pYes
- FOR EACH sfile IN Dir(User.home, "*")
+ FOR EACH sfile IN Dir(sSkellPath, "*")
SELECT CASE sFile
CASE ".kde"
@@ -54,11 +60,13 @@
END SELECT
IF sDesc THEN
+ IF Exist(stargetPath &/ sFile) THEN
'INC i
INC FrmResetSettings.gvSettings.Rows.Count
FrmResetSettings.gvSettings[i, 1].Text = sDesc
FrmResetSettings.gvSettings[i, 2].Text = sFile
INC i
+ END IF
END IF
NEXT
FrmResetSettings.gvSettings.Columns[1].Width =
FrmResetSettings.gvSettings.Width -
(FrmResetSettings.gvSettings.Columns[0].Width * 1.75)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
