Changeset 15 for devel

Timestamp:

05/24/07 17:33:42 (5 years ago)

Author:

bruno

Message:

Fix bugs on useless user dir creation, lib rights useless, uid parameters now handled

File:

• devel/sshgw/bin/createrootskel (modified) (7 diffs)

devel/sshgw/bin/createrootskel

@@ -1 +1 @@
 #!/bin/bash
+#
+# Create the chroot skeleton env (To be relaunched when changing distro ver e.g.
+#
+# $Id$
+#
 
-# Create the chroot skeleton env (To be relaunched when changing distro ver e.g.
+root=/etc/chrootskel
 
-users=""
 if [ _"$1" = _"retrofit" ]; then
-    users=`ls -d /home/chroot/*`
+    users="`ls -d /home/chroot/*` $root"
+elif [ _"$1" != _"" ]; then
+    for i in $*; do
+        users="$users `ls -d /home/chroot/$1`"
+        shift
+    done
+else
+    users="$root"
 fi
 
-root=/etc/chrootskel
 
 # Purge the old content and recreate it
@@ -17 +27 @@
 
 # Adds binaries
-sbins="/bin/bash /bin/cp /bin/ls /bin/mkdir /bin/mv /bin/rm /bin/rmdir /bin/grep /usr/local/bin/removehost"
+sbins="/bin/bash /bin/cp /bin/ls /bin/mkdir /bin/mv /bin/rm /bin/rmdir /bin/grep"
+ubins="/usr/bin/rdesktop /usr/bin/scp /usr/bin/sftp /usr/bin/ssh"
+xbins="/usr/X11R6/bin/xauth"
+lbins="/usr/lib/ssh/sftp-server"
+obins="/usr/local/bin/removehost"
 
-for d in $users $root; do
+for d in $users; do
     echo "Updating chroot env for $d"
     mkdir -p $d/bin
-    cp -a $sbins $d/bin
+    cp -a $sbins $obins $d/bin
     (cd $d/bin ; ln -sf bash sh)
 
@@ -70 +84 @@
 
     # Users
+    uid=`basename $d`
 
-    mkdir -p $d/home/user
-    touch $d/home/user/.bash_history
-
-    cat > $d/home/user/.bash_profile << EOF
-# .bash_profile
-# User specific environment and startup programs
-
-unset USERNAME
-EOF
-
-    cat > $d/home/user/.bashrc << EOF
-# .bashrc
-# User specific aliases and functions
-EOF
-
+    mkdir -p $d/home/$uid
+    touch $d/home/$uid/.bash_history
 
     # Temp
@@ -94 +96 @@
 
     mkdir -p $d/lib $d/usr/lib $d/usr/bin $d/usr/lib/ssh $d/usr/share/rdesktop/keymaps $d/usr/X11R6/bin $d/usr/X11R6/lib
-    obins="/usr/bin/rdesktop /usr/bin/scp /usr/bin/sftp /usr/bin/ssh"
-    xbins="/usr/X11R6/bin/xauth"
-    lbins="/usr/lib/ssh/sftp-server"
-    cp -a $obins $d/usr/bin
+    cp -a $ubins $d/usr/bin
     (cd $d/usr/bin ; ln -sf ssh slogin)
     cp -a $lbins $d/usr/lib/ssh
@@ -103 +102 @@
     cp -a $xbins $d/usr/X11R6/bin
     
-    bins="$sbins $obins $xbins $lbins"
+    bins="$sbins $ubins $xbins $lbins $obins"
 
     # Librairies
@@ -114 +113 @@
         cp -a $i $d/$dir
     done
-    # Rights for libs
-    for i in $libs; do
-        chmod 644 $d/$i
-    done
 
     # X11R6/lib is not in the default search path for libs => moved to usr/lib
@@ -127 +122 @@
     find $d -type d | xargs chmod 755
     for i in $bins; do
-        chmod 755 $d/$i
+        # obins are put under /bin
+        j=`echo $i | sed 's~/usr/local/bin~/bin~'`
+        chmod 755 $d/$j
     done
     chown -R chroot:chroot $d
+    chown -R ${uid}:chroot $d/home/$uid
     chmod 4777 $d/tmp
 done