[Vectorlinux-devel] [vinstall-ng commit] r533 - - Finished user import window - Added code to import existing user account

[<cod...@go...>]

Author: M0...@gm...
Date: Tue Apr 14 14:25:23 2009
New Revision: 533

Added:
    branches/speedy/Conf3a.class
    branches/speedy/Conf3a.form
Modified:
    branches/speedy/.lang/.pot
    branches/speedy/.project
    branches/speedy/ClsGlobal.class
    branches/speedy/Conf2.class
    branches/speedy/Conf3.class
    branches/speedy/MdlBootMngr.module
    branches/speedy/MdlMain.module

Log:
- Finished user import window - Added code to import existing user account

Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot	(original)
+++ branches/speedy/.lang/.pot	Tue Apr 14 14:25:23 2009
@@ -200,103 +200,190 @@
  msgid "Enter Passwrord"
  msgstr ""

-#: Conf2.class:198 Conf3.class:324
+#: Conf2.class:198 Conf3.class:379
  msgid "Re-enter Password"
  msgstr ""

-#: Conf3.class:22
+#: Conf3.class:43
  msgid "Create as many user accounts as you want / need here."
  msgstr ""

-#: Conf3.class:22
+#: Conf3.class:43
  msgid "Choose a unique login name for each user account."
  msgstr ""

-#: Conf3.class:26
+#: Conf3.class:47
  msgid "When finished, Click"
  msgstr ""

-#: Conf3.class:26 Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72
+#: Conf3.class:47 Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72
  #: Step5.class:177
  msgid "to continue"
  msgstr ""

-#: Conf3.class:76
+#: Conf3.class:98
  msgid "Select picture ID"
  msgstr ""

-#: Conf3.class:78
+#: Conf3.class:100
  msgid "Select picture ID for"
  msgstr ""

-#: Conf3.class:109
+#: Conf3.class:132
  msgid "You must enter a login name first."
  msgstr ""

-#: Conf3.class:112
+#: Conf3.class:135
  msgid "Please select a password for"
  msgstr ""

-#: Conf3.class:112
+#: Conf3.class:135
  msgid "before continuing"
  msgstr ""

-#: Conf3.class:115
+#: Conf3.class:138
  msgid "You must enter the password twice for added security"
  msgstr ""

-#: Conf3.class:145
+#: Conf3.class:165
  msgid "User"
  msgstr ""

-#: Conf3.class:145
+#: Conf3.class:165
  msgid "already exists in the system."
  msgstr ""

-#: Conf3.class:145
+#: Conf3.class:165
  msgid "Please select another user login name"
  msgstr ""

-#: Conf3.class:162
+#: Conf3.class:210
  msgid "Use only lowercase letters and numbers for this field"
  msgstr ""

-#: Conf3.class:225
+#: Conf3.class:280
  msgid "Create User Accounts"
  msgstr ""

-#: Conf3.class:275
+#: Conf3.class:330
  msgid "Login Name"
  msgstr ""

-#: Conf3.class:291
+#: Conf3.class:346
  msgid "Real Name"
  msgstr ""

-#: Conf3.class:307
+#: Conf3.class:362
  msgid "Enter Password"
  msgstr ""

-#: Conf3.class:352
+#: Conf3.class:407
  msgid "Click here to select user Login picture"
  msgstr ""

-#: Conf3.class:362
+#: Conf3.class:417
  msgid "Create User"
  msgstr ""

-#: Conf3.class:379
+#: Conf3.class:434
  msgid "Import Existing User"
  msgstr ""

-#: Conf3.class:395
+#: Conf3.class:450
  msgid "Clear Form"
  msgstr ""

-#: Conf3.class:410
+#: Conf3.class:465
  msgid "User Rights Management"
  msgstr ""

+#: Conf3a.class:56
+msgid "KDE Settings (Menu, Window decorations, etc)"
+msgstr ""
+
+#: Conf3a.class:58
+msgid "QT Toolkit settings (KDE Visual Effects)"
+msgstr ""
+
+#: Conf3a.class:60
+msgid "GTK Tookit theme Settings"
+msgstr ""
+
+#: Conf3a.class:62
+msgid "X-window basic settings (includes xterm settings)"
+msgstr ""
+
+#: Conf3a.class:64
+msgid "Bash init script"
+msgstr ""
+
+#: Conf3a.class:66
+msgid "Sound system preferences"
+msgstr ""
+
+#: Conf3a.class:68
+msgid "Graphical inteface preferences"
+msgstr ""
+
+#: Conf3a.class:70
+msgid "Desktop icons, folders, launchers"
+msgstr ""
+
+#: Conf3a.class:72
+msgid "IceWM settings, preferences, menu"
+msgstr ""
+
+#: Conf3a.class:74
+msgid "XMMS Audio player preferences"
+msgstr ""
+
+#: Conf3a.class:76
+msgid "ROX Filer Desktop settings"
+msgstr ""
+
+#: Conf3a.class:78
+msgid "MPlayer Multimedia Player Settings"
+msgstr ""
+
+#: Conf3a.class:80
+msgid "Default graphical session settings"
+msgstr ""
+
+#: Conf3a.class:117
+msgid "Setting"
+msgstr ""
+
+#: Conf3a.class:118 Step7a.class:49 Step7b.class:28
+msgid "Description"
+msgstr ""
+
+#: Conf3a.class:237
+msgid "Import user accounts into VectorLinux"
+msgstr ""
+
+#: Conf3a.class:250
+msgid ""
+"Select which user account to import, and which settings to reset.  
Un-checked "
+"items will be carried over, while checked items will be reset to factory "
+"defaults."
+msgstr ""
+
+#: Conf3a.class:260
+msgid "User account to import"
+msgstr ""
+
+#: Conf3a.class:279
+msgid "Account Contents to reset"
+msgstr ""
+
+#: Conf3a.class:306
+msgid "Accept"
+msgstr ""
+
+#: Conf3a.class:312
+msgid "Cancel"
+msgstr ""
+
  #: FMain.class:253 FMain0.class:253
  msgid "Process Overview"
  msgstr ""
@@ -1179,10 +1266,6 @@

  #: Step7a.class:34
  msgid "Component"
-msgstr ""
-
-#: Step7a.class:49 Step7b.class:28
-msgid "Description"
  msgstr ""

  #: Step7a.class:143

Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project	(original)
+++ branches/speedy/.project	Tue Apr 14 14:25:23 2009
@@ -1,7 +1,7 @@
  # Gambas Project File 2.0
  # Compiled with Gambas 2.12
  Title=VectorLinux Installer
-Startup=Conf3
+Startup=MdlStartUp
  Version=0.0.2
  Library=gb.gtk
  Library=gb.form

Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class	(original)
+++ branches/speedy/ClsGlobal.class	Tue Apr 14 14:25:23 2009
@@ -17,6 +17,7 @@

  STATIC PUBLIC fRunningMainForm AS Object

+STATIC PUBLIC sTargetPath AS String
  STATIC PUBLIC sDistroName AS String
  STATIC PUBLIC sDistroVer AS String


Modified: branches/speedy/Conf2.class
==============================================================================
--- branches/speedy/Conf2.class	(original)
+++ branches/speedy/Conf2.class	Tue Apr 14 14:25:23 2009
@@ -59,7 +59,7 @@
      STOP EVENT
      RETURN FALSE
    ELSE
-    SHELL "chroot /mnt/target /sbin/passwdx root " & Trim(textbox1.Text)  
& " || echo ERROR" TO sRes
+    SHELL "chroot " & ClsGlobal.sTargetPath & " /sbin/passwdx root " &  
Trim(textbox1.Text) & " || echo ERROR" TO sRes
        IF InStr(sRes, "ERROR") THEN
          Message.Error(("Password was not set. See error log below")  
& "<br>" & Trim(sRes))
          RETURN FALSE

Modified: branches/speedy/Conf3.class
==============================================================================
--- branches/speedy/Conf3.class	(original)
+++ branches/speedy/Conf3.class	Tue Apr 14 14:25:23 2009
@@ -13,6 +13,27 @@

  '    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 sListToReset AS String
+
+PUBLIC FUNCTION check_for_impartable_accounts() AS Boolean
+
+  DIM sFile AS String
+  DIM sDump AS String
+  DIM sMajorDump AS String
+    FOR EACH sFile IN Dir(ClsGlobal.sTargetPath &/ "home/", "*",  
gb.Directory)
+      IF sFile <> "ftp" THEN
+        SHELL "grep ^" & Trim(sFile) & ClsGlobal.sTargetPath  
&/ "etc/group" TO sDump
+          sDump = Trim(sDump)
+        IF sDump THEN sMajorDump = sMajorDump & sDump
+      END IF
+
+    NEXT
+  sMajorDump = Trim(sMajorDump)
+  IF sMajorDump THEN RETURN TRUE
+
+
+END
+

  PUBLIC SUB Form_Open()

@@ -28,6 +49,7 @@
       .btPicSel.Picture =  
Picture.Load("/usr/share/apps/kdm/pics/users/default2.png")
    END WITH
    WAIT 0.1
+  Button1.Enabled = ME.check_for_impartable_accounts()
    'MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)

  END
@@ -98,6 +120,7 @@
      ' default the picture
      ME.btPicSel.Picture =  
Picture.Load("/usr/share/apps/kdm/pics/users/default2.png")
      Dialog.Path = ""
+    sListToReset = ""

  END

@@ -148,10 +171,33 @@
      STOP EVENT
    END IF
    ' clear the form now
+    IF sListToReset THEN
+      ' user account is being imported
+      Reset_Accounts_Settings(Trim(ME.txtLogin.Text))
+    END IF
+
    Button2_Click()

  END

+PUBLIC SUB Reset_Accounts_Settings(sUsrLogin AS String)
+
+  DIM sSkelPath AS String = ClsGlobal.sTargetPath &/ "etc/skel"
+  DIM sTargetPath AS String = ClsGlobal.sTargetPath &/ "home" &/ sUsrLogin
+  DIM sSettings AS String[] =  
Split(Replace(Trim(sListToReset), " ", ","), ",")
+  DIM sFile AS String
+  DIM i AS Integer
+
+    FOR i = 0 TO sSettings.Max
+      sFile = Trim(sSettings[i])
+      TRY KILL sTargetPath &/ sFile
+      SHELL "cp -r " & sSkelPath &/ sFile & Space(1) & sTargetPath WAIT
+      SHELL "chroot " & ClsGlobal.sTargetPath & " /bin/chown " & sUsrLogin  
& ":users " & sTargetPath &/ sFile WAIT
+    NEXT
+
+
+
+END


  PUBLIC SUB txtLogin_KeyPress()
@@ -167,3 +213,10 @@

  END

+
+PUBLIC SUB Button1_Click()
+
+  Button2_Click()
+  Conf3a.Import_User()
+
+END

Added: branches/speedy/Conf3a.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf3a.class	Tue Apr 14 14:25:23 2009
@@ -0,0 +1,200 @@
+' 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/>.
+
+' ========= import user accounts =================
+PRIVATE $UserProps AS NEW Object[]
+PRIVATE pyes AS Picture
+PRIVATE pno AS Picture
+PUBLIC sListToReset AS String
+
+PUBLIC SUB LIST_USER_ACCOUNTS()
+
+  DIM sList AS String
+  DIM sFile, sDump AS String
+    FOR EACH sFile IN Dir("/home", "*", gb.Directory)
+      IF sFile <> "ftp" THEN
+        ' -== search /etc/group to make sure this user does not already  
exist ==-
+        SHELL "grep ^" & sFile & Space(1) & ClsGlobal.sTargetPath  
&/ "etc/group" TO sDump
+          sDump = Trim(sDump)
+            IF NOT (sDump) THEN ' user does not exist in the system yet
+                cbAcctLst.Add(sFile)
+            END IF
+      END IF
+    NEXT
+
+
+END
+
+PUBLIC SUB List_Resetable_settings()
+
+  DIM cb AS CheckBox
+  DIM sSetting, sDesc, sFile AS String
+  DIM irow AS Integer
+  DIM sSkelPath AS String = ClsGlobal.sTargetPath &/ "etc/skel"
+  DIM sTargetPath AS String = ClsGlobal.sTargetPath &/ "home" &/  
Trim(cbAcctLst.Text)
+
+  ' load the pictures
+  pyes = Picture.Load("images/16px-check.png")
+  'pno = Picture.Load("images/16px-Nocheck.png")
+  irow = 1
+  FOR EACH sFile IN Dir(sSkelPath, "*")
+    SELECT CASE sFile
+            CASE ".kde"
+              sDesc = ("KDE Settings (Menu, Window decorations, etc)")
+            CASE ".qt"
+              sDesc = ("QT Toolkit settings (KDE Visual Effects)")
+            CASE ".gtkrc-*"
+              sDesc = ("GTK Tookit theme Settings")
+            CASE ".Xdefaults"
+              sDesc = ("X-window basic settings (includes xterm settings)")
+            CASE ".bashrc"
+              sDesc = ("Bash init script")
+            CASE ".asoundrc"
+              sDesc = ("Sound system preferences")
+            CASE ".xinitrc"
+              sDesc = ("Graphical inteface preferences")
+            CASE "Desktop"
+              sDesc = ("Desktop icons, folders, launchers")
+            CASE ".IceWM", ".icewm"
+              sDesc = ("IceWM settings, preferences, menu")
+            CASE ".xmms"
+              sDesc = ("XMMS Audio player preferences")
+            CASE ".Choices", "Choices"
+              sDesc = ("ROX Filer Desktop settings")
+            CASE ".mplayer"
+              sDesc = ("MPlayer Multimedia Player Settings")
+            CASE ".xsession"
+              sDesc = ("Default graphical session settings")
+          CASE ELSE
+            sDesc = ""
+      END SELECT
+
+    IF Exist(sTargetPath &/ sFile) THEN
+      ' add to the list
+      IF sDesc THEN
+      INC irow
+      gvSettingsList.Rows.Count = irow + 1
+        ME.gvSettingsList[irow, 0].Picture = pyes
+        ME.gvSettingsList[irow, 0].Alignment = Align.Center
+        ME.gvSettingsList[irow, 1].Text = sFile
+        ME.gvSettingsList[irow, 2].Text = sDesc
+        'INC irow
+
+      END IF
+    END IF
+  NEXT
+
+
+
+END
+
+
+PUBLIC SUB Form_Open()
+
+  WITH ME
+    .tlbanner.Text = "<b>" & tlbanner.text & "</b>"
+    .gvSettingsList.Rows.Count = 3
+    .gvSettingsList.Columns.Count = 3
+    .gvSettingsList.Columns[0].Width = 32
+    .gvSettingsList.Columns[2].Width = 150
+    .gvSettingsList.Rows[1].Height = 12
+    .gvSettingsList[0, 0].BackColor = Color.SelectedBackground
+    .gvSettingsList[0, 1].BackColor = Color.SelectedBackground
+    .gvSettingsList[0, 2].BackColor = Color.SelectedBackground
+    .gvSettingsList[0, 1].Text = ("Setting")
+    .gvSettingsList[0, 2].Text = ("Description")
+    .gvSettingsList[0, 1].Font.Bold = TRUE
+    .gvSettingsList[0, 1].Alignment = Align.Center
+    .gvSettingsList[0, 2].Font.Bold = TRUE
+    .gvSettingsList[0, 2].Alignment = Align.Center
+
+  END WITH
+  ME.LIST_USER_ACCOUNTS()
+END
+
+PUBLIC SUB Form_Resize()
+
+  WITH ME
+    .hbox2.Width = .HBox2.Parent.Width - (.HBox2.Left * 2)
+    .Frame1.Height = ME.ClientH - (.Frame1.Top + hbox5.Height + 8)
+    .HBox2.Height = .HBox2.Parent.Height - (.HBox2.top * 1.25)
+  END WITH
+
+END
+
+PUBLIC SUB cbAcctLst_Click()
+
+  List_Resetable_settings()
+
+END
+
+PUBLIC SUB gvSettingsList_Click()
+
+  IF LAST.Column > 1 THEN RETURN
+'  PRINT gvSettingsList[LAST.row, 1].text
+  IF gvSettingsList[LAST.row, 0].Picture = pyes THEN
+    gvSettingsList[LAST.row, 0].Picture = pno
+  ELSE IF gvSettingsList[LAST.row, 0].Picture = pno THEN
+    gvSettingsList[LAST.row, 0].Picture = pyes
+  END IF
+
+  gvSettingsList.Refresh
+
+
+END
+
+PUBLIC SUB btCancel_Click()
+
+  sListToReset = ""
+  ME.Close
+
+END
+
+PUBLIC SUB Get_Selected_Settings_For_Reset()
+
+  DIM irow AS Integer
+  DIM sList AS String
+    FOR irow = 2 TO gvSettingsList.Rows.Count - 1
+      IF gvSettingsList[irow, 0].Picture = pyes THEN
+        sList = sList & Space(1) & gvSettingsList[irow, 1].Text
+      END IF
+    NEXT
+    sList = Trim(sList)
+    ' IF sList THEN
+    '    Message(sList)
+    ' ELSE
+    '   Message("No settings to reset")
+    ' END IF
+
+
+END
+
+
+PUBLIC SUB btOK_Click()
+
+  Get_Selected_Settings_For_Reset()
+  Conf3.txtLogin.Text = Trim(ME.cbAcctLst.Text)
+  Conf3.sListToReset = sListToReset
+  ME.Close
+
+END
+PUBLIC FUNCTION Import_User() AS String
+
+
+  ME.Show()
+
+END
+

Added: branches/speedy/Conf3a.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf3a.form	Tue Apr 14 14:25:23 2009
@@ -0,0 +1,80 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,64,57)
+  Text = ("")
+  Arrangement = Arrange.Row
+  Padding = 2
+  { HPanel1 HPanel
+    MoveScaled(0,0,60,5)
+    Expand = True
+    { tlbanner TextLabel
+      MoveScaled(12,0,33,3)
+      Expand = True
+      Text = ("Import user accounts into VectorLinux")
+      Alignment = Align.Center
+    }
+    { Separator1 Separator
+      MoveScaled(13,4,25,1)
+      Expand = True
+    }
+  }
+  { TextLabel1 TextLabel
+    MoveScaled(1,6,61,8)
+    Expand = True
+    Text = ("Select which user account to import, and which settings to  
reset. Un-checked items will be carried over, while checked items will be  
reset to factory defaults.")
+  }
+  { HBox1 HBox
+    MoveScaled(1,14,54,3.5)
+    Expand = True
+    { TextLabel2 TextLabel
+      MoveScaled(0,0,26,3.5)
+      Expand = True
+      Text = ("User account to import")
+      Alignment = Align.Left
+    }
+    { cbAcctLst ComboBox
+      MoveScaled(28,0,26,4)
+      Text = ("")
+      ReadOnly = True
+    }
+  }
+  { HBox4 HBox
+    MoveScaled(36,18,12,1)
+    Expand = True
+  }
+  { Frame1 Frame
+    MoveScaled(1,19,61,33)
+    Expand = True
+    Text = ("Account Contents to reset")
+    { HBox2 HBox
+      MoveScaled(1,3,58,29)
+      Expand = True
+      { gvSettingsList GridView
+        MoveScaled(2,4,32,19)
+        Expand = True
+      }
+      { HBox3 HBox
+        MoveScaled(37,8,11,1)
+        Visible = False
+        Expand = True
+      }
+    }
+  }
+  { HBox5 HBox
+    MoveScaled(2,53,52,3.5)
+    Expand = True
+    Spacing = 4
+    Padding = 2
+    { btOK Button
+      MoveScaled(0,0,14,3.5)
+      Text = ("Accept")
+      Picture = Picture["icon:/small/apply"]
+    }
+    { btCancel Button
+      MoveScaled(18,0,17,3.5)
+      Text = ("Cancel")
+      Picture = Picture["icon:/small/cancel"]
+    }
+  }
+}

Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module	(original)
+++ branches/speedy/MdlBootMngr.module	Tue Apr 14 14:25:23 2009
@@ -447,7 +447,7 @@
      NEXT

      'Determine how the root partition was formatted
-      SHELL "df -hT /mnt/target | tr -s \' \' | grep \"^/dev\" | cut -f 2  
-d \' \'" TO sDump
+      SHELL "df -hT " & ClsGlobal.sTargetPath & " | tr -s \' \' | grep  
\"^/dev\" | cut -f 2 -d \' \'" TO sDump
        sDump = Trim(sDump)
      IF LCase(sDump) <> "xfs" THEN
        objCB.Add(("Bootsector of") & Space(1) & ClsGlobal.sRoot)

Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module	(original)
+++ branches/speedy/MdlMain.module	Tue Apr 14 14:25:23 2009
@@ -98,7 +98,7 @@
  END

  PUBLIC SUB SET_TIME_ZONE(sTimeZone AS String, hwclock AS String)
-  DIM sTarget AS String = "/mnt/target"
+  DIM sTarget AS String = ClsGlobal.sTargetPath
    DIM sCfg AS String

    TRY KILL sTarget &/ "etc" &/ "localtime-copied-from"
@@ -148,7 +148,7 @@

    DIM sDump AS String

-  SHELL "grep ^\"" & sName & "\" /mnt/target/etc/group" TO sDump
+  SHELL "grep ^\"" & sName & "\" " & ClsGlobal.sTargetPath &/ "etc/group"  
TO sDump
    sDump = Trim(sDump)
    IF Len(sDump) > 0 THEN
      RETURN TRUE
@@ -180,11 +180,11 @@


    '-== Just to be safe, make sure the group user does not exist before  
trying to create a new user ==-
-  SHELL "chroot /mnt/target /usr/sbin/groupdel " & sUsrLogIn & " >  
/dev/null " WAIT
+  SHELL "chroot " & ClsGlobal.sTargetPath & " /usr/sbin/groupdel " &  
sUsrLogIn & " > /dev/null " WAIT
    '-== Create new group for user ==-
-  SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & (1000 + iUID) &  
Space(1) & sUsrLogIn & " > /dev/null" WAIT
+  SHELL "chroot " & ClsGlobal.sTargetPath & " /usr/sbin/groupadd -g " &  
(1000 + iUID) & Space(1) & sUsrLogIn & " > /dev/null" WAIT
    '-== Create new user account ==-
-  SHELL "chroot /mnt/target /usr/sbin/useradd -m -c \'" & sUsrRlName & "\'  
-g " & sUsrLogIn &
+  SHELL "chroot " & ClsGlobal.sTargetPath & " /usr/sbin/useradd -m -c \'"  
& sUsrRlName & "\' -g " & sUsrLogIn &
          " -p " & Trim(sPass) & " -u " & (1000 + iUID) & " -G \'"  
& "users," & sGrpLst & "\' -s /bin/bash " &
          Trim(sUsrLogIn) & " || echo FAILED" TO sDump
            ' [Quick error check]
@@ -194,18 +194,18 @@
                  RETURN 1
                END IF
    ' -== Just to be sure... re-run the password to make sure it's set ==-'
-  SHELL "chroot /mnt/target /sbin/passwdx " & sUsrLogIn & Space(1) & sPass  
& " >/dev/null " WAIT
+  SHELL "chroot " & ClsGlobal.sTargetPath & " /sbin/passwdx " & sUsrLogIn  
& Space(1) & sPass & " >/dev/null " WAIT
    ' -== Set the face icon ==-
          IF sPicPath THEN
            ' -= fix for KDM login (KDE3) =-
-            TRY LINK "/mnt/target/usr/share/apps/kdm/pics/users" &/  
sUsrLogIn & ".face.icon" TO sPicPath
+            TRY LINK ClsGlobal.sTargetPath  
&/ "usr/share/apps/kdm/pics/users" &/ sUsrLogIn & ".face.icon" TO sPicPath
  '              CATCH
  '                SHELL "ln -s " & sPicPath & Space(1)  
& "/mnt/target/usr/share/apps/kdm/pics/users" &/ sUsrLogIn &/ ".face.icon"
            ' -= fix for GDM login =-
-            TRY COPY sPicPath TO "/mnt/target/home" &/ sUsrLogIn &/ ".face"
-            SHELL "chmod 664 /mnt/target/home" &/ sUsrLogIn &/ ".face  
2>/dev/null" WAIT
-            SHELL "chroot /mnt/target /bin/chown " & sUsrLogIn & Space(1)  
& "/home/" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
-            SHELL "chroot /mnt/target /bin/chgrp " & sUsrLogIn & Space(1)  
& "/home" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
+            TRY COPY sPicPath TO ClsGlobal.sTargetPath &/ "home" &/  
sUsrLogIn &/ ".face"
+            SHELL "chmod 664 " & ClsGlobal.sTargetPath &/ "home" &/  
sUsrLogIn &/ ".face 2>/dev/null" WAIT
+            SHELL "chroot " & ClsGlobal.sTargetPath & " /bin/chown " &  
sUsrLogIn & Space(1) & "/home/" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
+            SHELL "chroot " & ClsGlobal.sTargetPath & " /bin/chgrp " &  
sUsrLogIn & Space(1) & "/home" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
        END IF

    ' USER ACCOUNT HAS BEEN CREATED