Author: uelsk8s
Date: Mon Nov 10 10:42:20 2008
New Revision: 274
Modified:
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmUserAdd.class
branches/iVL/installer.gambas
Log:
fixed permissions on gdm user pic
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Nov 10 10:42:20 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.142
+Version=0.0.154
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Nov 10 10:42:20 2008
@@ -184,7 +184,7 @@
IF LAST.TEXT = ("Restart") THEN
'EXEC "shutdown", "-r", " now"
- EXEC ["shutdown", "-r", "now"]
+ EXEC ["init", "6"]
ELSE
IF FrmLangSel.Visible = TRUE THEN
@@ -386,7 +386,9 @@
CASE "FrmDone"
'offer to reboot here
-
+ SHELL ["sed", "-i", "'/^$/d'", "/root/gui.log"] WAIT
+ SHELL ["sed", "-i", "'/^(installer/d'", "/root/gui.log"] WAIT
+ COPY "/root/gui.log" TO "/mnt/target/var/log/setup/gui.log"
ME.END_INSTALLER()
'frmNext = FrmAlsaConf
' frmNext = FrmLilo ' this is already done
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Mon Nov 10 10:42:20 2008
@@ -107,19 +107,7 @@
RETURN
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
-
- 'IF IsDir(sPicdir) THEN
- IF bUsePic.Value = TRUE THEN
- '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"
- 'this next line is for kdm
- SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
- 'this next line is for gdm
- SHELL "cd /mnt/target/home/" & tbUsername.Text & "; cp " &
Replace(tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) & ".face" WAIT
-
- ENDIF
-
+
'COMPILE LIST OF GROUPS THIS USER WILL BELONG TO
FOR EACH cb IN MdlUsrAdd.objGrps
IF cb.Value = TRUE THEN
@@ -128,11 +116,7 @@
NEXT
sGroups = Right(sGroups, Len(sGroups) - 1)
'Message(sGroups)
-
-
-
-
- ' need to do some binding for this to work
+ 'need to do some binding for this to work
'PRINT "Mounting system locations with bind options"
'SHELL "mount -o bind /sys /mnt/target/sys" WAIT
'SHELL "mount -o bind /tmp /mnt/target/tmp" WAIT
@@ -156,6 +140,20 @@
'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
+ 'IF IsDir(sPicdir) THEN
+ IF bUsePic.Value = TRUE THEN
+ '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"
+ '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
+ '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
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " &
tbUsername.Text & Space(1) &/ "home/" & tbUsername.Text & "/.face" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " &
tbUsername.Text & Space(1) &/ "home/" & tbUsername.Text & "/.face" WAIT
+ ENDIF
Message(("User account for") & Space(1) & ME.tbUsername.Text &
Space(1) & ("was created."))
btClrFrm_Click() ' clear the form
INC iUID
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
