Changeset 16 for devel

Timestamp:

05/24/07 20:57:25 (5 years ago)

Author:

bruno

Message:

Adaptations for MDV 2007.1 update

File:

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

devel/sshgw/bin/createrootskel

@@ -7 +7 @@
 
 root=/etc/chrootskel
+chroot=/home/chroot
 
 if [ _"$1" = _"retrofit" ]; then
-    users="`ls -d /home/chroot/*` $root"
+    users="`ls -d $chroot/*` $root"
 elif [ _"$1" != _"" ]; then
     for i in $*; do
-        users="$users `ls -d /home/chroot/$1`"
+        users="$users `ls -d $chroot/$1`"
         shift
     done
@@ -28 +29 @@
 # Adds binaries
 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"
+ubins="/usr/bin/rdesktop /usr/bin/scp /usr/bin/sftp /usr/bin/ssh /usr/bin/xauth"
+# Obsolete in 2007.1
+#xbins="/usr/X11R6/bin/xauth"
 lbins="/usr/lib/ssh/sftp-server"
 obins="/usr/local/bin/removehost"
 
 for d in $users; do
+    uid=`basename $d`
+
     echo "Updating chroot env for $d"
+    rm -rf $d/bin
     mkdir -p $d/bin
     cp -a $sbins $obins $d/bin
@@ -41 +46 @@
     # Adds devices
 
+    rm -rf $d/dev
     mkdir -p $d/dev
     cp -a /dev/null /dev/random /dev/tty /dev/urandom /dev/zero $d/dev
@@ -46 +52 @@
     # Adds conf files
 
+    rm -rf $d/etc
     mkdir -p $d/etc
     cat > $d/etc/passwd << EOF
@@ -51 +58 @@
 adm:x:4:4:Mister adm:/bin/false
 EOF
+    grep -E "^${uid}:" /etc/passwd | sed "s~$chroot/$uid/.~~" >> $d/etc/passwd
     cat > $d/etc/group << EOF
 root:x:99:
@@ -84 +92 @@
 
     # Users
-    uid=`basename $d`
 
     mkdir -p $d/home/$uid
@@ -91 +98 @@
     # Temp
 
+    rm -rf $d/tmp $d/var
     mkdir -p $d/tmp $d/var
 
     # Programs
 
-    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
+    rm -rf $d/lib $d/usr
+    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
     cp -a $ubins $d/usr/bin
     (cd $d/usr/bin ; ln -sf ssh slogin)
     cp -a $lbins $d/usr/lib/ssh
     cp -a /usr/share/rdesktop/keymaps/* $d/usr/share/rdesktop/keymaps
-    cp -a $xbins $d/usr/X11R6/bin
+    #cp -a $xbins $d/usr/X11R6/bin
     
-    bins="$sbins $ubins $xbins $lbins $obins"
+    bins="$sbins $ubins $lbins $obins"
 
     # Librairies
@@ -115 +124 @@
 
     # X11R6/lib is not in the default search path for libs => moved to usr/lib
-    for i in $d/usr/X11R6/lib/*; do
-        mv $i $d/usr/lib
-    done
+    # Obsolete in 2007.1
+    #for i in $d/usr/X11R6/lib/*; do
+        #mv $i $d/usr/lib
+    #done
 
     # Adjust modes and rights