From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sat, 1 Oct 2011 22:02:45 +0000 (+0000)
Subject: Création de l'usager régulier seulement à la fin du stage 5.
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=7fe1cd7181ae5243d921fc76185d98db55366866;p=hvlinux.git

Création de l'usager régulier seulement à la fin du stage 5.
---

diff --git a/stage2/post-install b/stage2/post-install
index fb6c992..5da1992 100755
--- a/stage2/post-install
+++ b/stage2/post-install
@@ -14,12 +14,8 @@ EOF
 
 chmod -v 644 /etc/default/useradd
 
-if [ -n "${REGUSER}" ]; then
-    hv_useradd -g users -G audio,video,cdrom,usb,shutdown -s /bin/bash -m ${REGUSER}
-fi
-
 echo "Copying /etc/skel files to root directory"
-# Copy skel files to root directory. First create a copy to change owner
+# First create a copy to change owner
 cp -au /etc/skel/.??* /root
 
 # Fixing ownership of directories /tmp and /var/log (may have been created by
diff --git a/stage4/pkg/hal b/stage4/pkg/hal
index 78d38ac..b90ea66 100644
--- a/stage4/pkg/hal
+++ b/stage4/pkg/hal
@@ -47,7 +47,7 @@ hvbuild_post()
 EOF
 
     # Now add the users you would like to the halusers group to use HAL:
-    usermod -a -G halusers ${REGUSER}
+    ##usermod -a -G halusers ${USERNAME}
 
     # With the above configuration in place, authorized users now have the
     # ability to unmount disk partitions mounted at non-standard locations such
diff --git a/stage5/post-install b/stage5/post-install
index e5adb97..6c953a9 100755
--- a/stage5/post-install
+++ b/stage5/post-install
@@ -2,6 +2,11 @@
 
 source ../functions/main
 
+if [ -n "${REGUSER}" ]; then
+    hv_useradd -g users -G audio,video,cdrom,usb,shutdown,halusers \
+        -s /bin/bash -m ${REGUSER}
+fi
+
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     #########################################