fix variable name

[schsh.git] / makeschsh

diff --git a/makeschsh b/makeschsh
index 54766877ace130069e449f83688063bbac844739..b301c2d647c9d0c1a8605dba2579514955538dd9 100755 (executable)
--- a/makeschsh
+++ b/makeschsh
@@ -9,7 +9,7 @@ chroots = "/var/lib/schsh"
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
 # DO NOT TOUCH ANYTHING BELOW THIS LINE
 
-import os, sys, subprocess, pwd, grp
+import os, sys, subprocess, pwd, grp, shutil
 
 if os.getuid() != 0:
        print("Run this a root, please.")
@@ -21,6 +21,7 @@ def setup(name):
        if os.path.exists(chroot):
                raise Exception(chroot+" already exists, please remove it first")
        userpw = pwd.getpwnam(name)
+       data = "/home/{0}/data".format(name)
        
        # schroot configuration
        with open("/etc/schroot/chroot.d/schsh-"+name, "w") as f:
@@ -35,15 +36,15 @@ setup.fstab=schsh/{0}.fstab
                # no spaces, schroot does not like them
                print("# <file system> <mount point>   <type>  <options>       <dump>  <pass>", file=f)
                # system folders
-               for folder in ("/lib", "/lib64", "/usr/bin", "/usr/lib", "/usr/lib64"):
+               for folder in ("/lib", "/lib64", "/usr/bin", "/usr/lib", "/usr/lib64", "/usr/share/", "/usr/local/bin"):
                        if os.path.exists(folder):
                                print("{0}\t{0}\tnone\trw,bind\t0\t0".format(folder), file=f)
                # user folder
-               print("/home/{0}/data\t/data\tnone\trw,bind\t0\t0".format(name), file=f)
+               print("{0}\t/data\tnone\trw,bind\t0\t0".format(data), file=f)
        
        # setup the schroot directory
        os.mkdir(chroot)
-       for folder in ["etc", "dev", "bin", "usr", "data"]:
+       for folder in ["etc", "dev", "data"]:
                os.mkdir(os.path.join(chroot, folder))
        
        # setup /etc/passwd and /etc/group
@@ -58,7 +59,13 @@ setup.fstab=schsh/{0}.fstab
                        groupgrp = grp.getgrnam(group)
                        assert usergrp.gr_gid != groupgrp.gr_gid
                        print("{0}:x:{1}:{2}".format(groupgrp.gr_name, groupgrp.gr_gid, name), file=f)
-       
+
+               # Make sure ~/data (part of the fstab above) exists.
+               if not os.path.exists(data):
+                       os.mkdir(data)
+               shutil.chown(data, name, name)
+               os.chmod(data, 0o640)
+
        # user configuration
        if userpw.pw_shell != schsh:
                subprocess.check_output(["usermod", "--shell", schsh, name])