Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r217 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-10-07 21:26:39
|
Author: m0e.lnx
Date: Tue Oct 7 14:25:42 2008
New Revision: 217
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/DevLog
branches/iVL/DevNotes
branches/iVL/FMain.class
branches/iVL/FrmRootPass.form
branches/iVL/FrmUserAdd.class
branches/iVL/MdlSummarize.module
branches/iVL/MdlUsrAdd.module
Log:
- Fixed problem with user accounts not getting created.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Oct 7 14:25:42 2008
@@ -14,43 +14,43 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:229
+#: FMain.class:231
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:231
+#: FMain.class:233
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:231
+#: FMain.class:233
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:245
+#: FMain.class:247
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:301
+#: FMain.class:303
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:406
+#: FMain.class:408
msgid "Process Overview"
msgstr ""
-#: FMain.class:426
+#: FMain.class:428
msgid "Next"
msgstr ""
-#: FMain.class:432
+#: FMain.class:434
msgid "Back"
msgstr ""
-#: FMain.class:438
+#: FMain.class:440
msgid "Exit Installation"
msgstr ""
-#: FMain.class:454
+#: FMain.class:456
msgid "Button1"
msgstr ""
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Tue Oct 7 14:25:42 2008
@@ -1 +1 @@
-- User add window is ready for testing
\ No newline at end of file
+- Fixed problem with user accounts not getting created.
\ No newline at end of file
Modified: branches/iVL/DevNotes
==============================================================================
--- branches/iVL/DevNotes (original)
+++ branches/iVL/DevNotes Tue Oct 7 14:25:42 2008
@@ -5,6 +5,7 @@
- combobox to select config method
- textboxes for static IP settings.
\- wireless settings section must be moved to the right if this
happens
+* Item positioning for smaller window resolutions is off (needs testing in
smaller window resolutions)
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Oct 7 14:25:42 2008
@@ -41,7 +41,7 @@
-ME.Maximized = TRUE
+'ME.Maximized = TRUE
frmInit = MdlCore.frmInit
'MdlCore.LOCK_GUI
'frmInit = FrmLangSel
@@ -75,6 +75,8 @@
.tvPlan.BackColor = Color.transparent
.tlBanner.Height = .PictureBox1.Height
'.tvPlan.Width = MdlCore.iLeftWidth
+ .Width = 800
+ .Height = 600
END WITH
Modified: branches/iVL/FrmRootPass.form
==============================================================================
--- branches/iVL/FrmRootPass.form (original)
+++ branches/iVL/FrmRootPass.form Tue Oct 7 14:25:42 2008
@@ -15,29 +15,29 @@
MoveScaled(2,1,62,3.1667)
Text = ("System Administrator")
}
+ { hrSep Separator
+ MoveScaled(2,5,15,1)
+ }
+ { Button1 Button
+ MoveScaled(53,51,11,2)
+ Text = ("Set Password")
+ }
{ tbPasswd2 TextBox
- MoveScaled(31,37,21,3.1667)
+ MoveScaled(29,6,21,3.1667)
Text = ("")
Password = True
}
{ tbPasswd1 TextBox
- MoveScaled(29,31,21,3.1667)
+ MoveScaled(30,0,21,3.1667)
Text = ("")
Password = True
}
- { tlPass2 TextLabel
- MoveScaled(2,37,22,4)
- Text = ("Re-Enter Password")
- }
{ tlPass1 TextLabel
- MoveScaled(2,32,22,4)
+ MoveScaled(0,1,22,4)
Text = ("Enter Password")
}
- { Button1 Button
- MoveScaled(53,51,11,2)
- Text = ("Set Password")
- }
- { hrSep Separator
- MoveScaled(2,5,15,1)
+ { tlPass2 TextLabel
+ MoveScaled(0,6,22,4)
+ Text = ("Re-Enter Password")
}
}
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Tue Oct 7 14:25:42 2008
@@ -30,6 +30,8 @@
END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
+ .tbPicPath.Visible = FALSE
+ .btBrowse.Visible = FALSE
END WITH
'WAIT 3
@@ -63,18 +65,18 @@
END IF
SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[^a-z0-9_-]\'" TO
sCHAR
- SHELL "grep -e ^" & ME.tbUsername.Text & " /mnt/target/etc/passwd" TO
sLogE
+ SHELL "grep -e ^" & ME.tbUsername.Text & ClsGlobal.sTargetMnt
&/ "etc/passwd" TO sLogE
IF sCHAR <> "" THEN
Message(("Username contains illegal characters"))
- STOP EVENT
+ RETURN
ELSE IF sLogE <> "" THEN
Message(("Username already exists"))
- STOP EVENT
+ RETURN
ELSE
IF ME.tbPasswd1.Text = "" THEN
Message(("Enter a Password."))
- STOP EVENT
+ RETURN
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
@@ -83,7 +85,8 @@
'SHELL "cd " & sPicdir & " && ln -s root1.png
root.face.icon" ' This needs to go somewhere else
'SHELL "cd " & sPicdir & " ; ln -s default3.png " &
ME.tbUsername.Text & ".face.icon"
- SHELL "cd " & sPicdir & "; ln -s " & tbPicPath.Text & Space(1)
& tbUsername.Text & ".face.icon" WAIT
+
+ SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
ENDIF
@@ -94,15 +97,21 @@
END IF
NEXT
sGroups = Right(sGroups, Len(sGroups) - 1)
- Message(sGroups)
+ 'Message(sGroups)
- SHELL "chroot /mnt/target groupdel " & ME.tbUsername.Text WAIT
- SHELL "chroot /mnt/target groupadd -g " & iUID & Space(1) &
ME.tbUsername.Text WAIT
+ SHELL "chroot /mnt/target /usr/sbin/groupdel " &
ME.tbUsername.Text & " &> /dev/null" WAIT
+ 'SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & iUID &
Space(1) & ME.tbUsername.Text WAIT
+ SHELL "chroot /mnt/target /usr/sbin/groupadd " &
ME.tbUsername.Text & " &> /dev/null" WAIT
'Message("chroot /mnt/target /usr/sbin/useradd -m -s /bin/bash
-u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups &
ME.tbUsername.Text)
- SHELL "chroot /mnt/target /usr/sbin/useradd -m -s /bin/bash -u "
& iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups & Space(1) &
ME.tbUsername.Text WAIT
+ 'SHELL "chroot /mnt/target /usr/sbin/useradd -m -s /bin/bash
-u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups & Space(1) &
ME.tbUsername.Text WAIT
+ SHELL "chroot /mnt/target /usr/sbin/useradd -m -c " & "\'" &
ME.tbRealname.text & "\'" & " -g " & ME.tbUsername.text &
+ " -p " & ME.tbPasswd1.text & " -G " & "\'" & sGroups & "\' " &
ME.tbUsername.Text WAIT
+ ' sDocmd = "useradd -m -c " & "\'" & sname & "\'" & " -g " &
slogin & " -p " & ME.txtpass1.Text &
+ '" -G " & "\'" & sgrparse & "\' " & slogin
+
'Message("chroot /mnt/target /sbin/passwdx " &
ME.tbUsername.Text & Space(1) & ME.tbPasswd1.Text)
SHELL "chroot /mnt/target /sbin/passwdx " & ME.tbUsername.Text &
Space(1) & ME.tbPasswd1.Text WAIT
Message("user " & ME.tbUsername.Text & " was created.")
@@ -135,7 +144,7 @@
.hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
.tlExp.Move(4, .hrSep.top + .hrSep.Height + 12, .hrSep.Width)
.TextLabel2.Move(4, .tlExp.top + .tlExp.Height + 8,
MdlObjSizer.get_object_width(.TextLabel2.text) * 2.5)
- .tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width +
4, .TextLabel2.top, .TextLabel2.Width * 1.75)
+ .tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width +
4, .TextLabel2.top, .TextLabel2.Width * 1.25)
iboxleft = .tbUsername.Left
iboxwidth = .tbUsername.Width
Modified: branches/iVL/MdlSummarize.module
==============================================================================
--- branches/iVL/MdlSummarize.module (original)
+++ branches/iVL/MdlSummarize.module Tue Oct 7 14:25:42 2008
@@ -52,7 +52,7 @@
END IF
IF ClsPkgSel.bCustom = TRUE THEN
- sText = sText & "<b>" & ("INSTALL TYPE:") & "</b>" & Space(1) &
("Custom") & "<br>)"
+ sText = sText & "<b>" & ("INSTALL TYPE:") & "</b>" & Space(1) &
("Custom") & "<br>"
sText = sText & "<br><b>" & ("BULK PACKAGES:") & "</b> "
FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Tue Oct 7 14:25:42 2008
@@ -17,7 +17,7 @@
PUBLIC objGrps AS Object[]
PUBLIC SUB DISPLAY_USER_GROUP_OPTIONS()
-DIM sGrpList AS String
= "cdrom,floppy,lp,scanner,audio,video,game,adm,sys,wheel,plugdev,disk"
+DIM sGrpList AS String
= "cdrom,floppy,lp,scanner,audio,video,games,adm,sys,wheel,plugdev,disk"
DIM sGrpArr AS String[]
DIM i AS Integer
DIM sLabel, sComment, sToolTip AS String
@@ -51,7 +51,7 @@
CASE "video"
sComment = ("This user is allowed to change video settings")
bdefval = TRUE
- CASE "game"
+ CASE "games"
sComment = ("This user is allowed to play restricted games")
bdefval = TRUE
CASE "adm"
|
