better names for some files and things

diff --git a/Makefile b/Makefile
index bd9e5b00214f84f2649fdfeea43f8f610fb91e85..5700d338b4cfebaf4f961ee17e9f7cfbb14b6feb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,5 @@ SCHROOT := /etc/schroot
 
 install:
        install -o root -g root schsh makeschsh $(TARGET)/bin/
 
 install:
        install -o root -g root schsh makeschsh $(TARGET)/bin/

-       install -o root -g root -d $(SCHROOT)/user/
-       install -o root -g root -m 644 schroot/user/* $(SCHROOT)/user/
+       install -o root -g root -d $(SCHROOT)/schsh/
+       install -o root -g root -m 644 schroot/schsh/* $(SCHROOT)/schsh/

diff --git a/makeschsh b/makeschsh
index 0dbb0aab2edc77427cb3362512317ce954722287..61b37f63d3045846437d19d3aee9907d4e2049bf 100755 (executable)
--- a/makeschsh
+++ b/makeschsh
@@ -23,15 +23,15 @@ def setup(name):
        userpw = pwd.getpwnam(name)
        
        # schroot configuration
        userpw = pwd.getpwnam(name)
        
        # schroot configuration

-       with open("/etc/schroot/chroot.d/user-"+name, "w") as f:
-               print >>f, """[user-{0}]
+       with open("/etc/schroot/chroot.d/schsh-"+name, "w") as f:
+               print >>f, """[schsh-{0}]

 type=directory
 directory={1}
 users={0}
 type=directory
 directory={1}
 users={0}

-profile=user
-setup.fstab=user/user-{0}.fstab
+profile=schsh
+setup.fstab=schsh/{0}.fstab

 """.format(name, chroot)
 """.format(name, chroot)

-       with open("/etc/schroot/user/user-"+name+".fstab", "w") as f:
+       with open("/etc/schroot/schsh/"+name+".fstab", "w") as f:

                print >>f, """# <file system> <mount point>   <type>  <options>       <dump>  <pass>
 /bin          \t/bin          \tnone  \trw,bind       \t0     \t0
 /lib          \t/lib          \tnone  \trw,bind       \t0     \t0
                print >>f, """# <file system> <mount point>   <type>  <options>       <dump>  <pass>
 /bin          \t/bin          \tnone  \trw,bind       \t0     \t0
 /lib          \t/lib          \tnone  \trw,bind       \t0     \t0

diff --git a/schroot/user/copyfiles b/schroot/schsh/copyfiles
similarity index 100%
rename from schroot/user/copyfiles
rename to schroot/schsh/copyfiles

diff --git a/schroot/user/nssdatabases b/schroot/schsh/nssdatabases
similarity index 100%
rename from schroot/user/nssdatabases
rename to schroot/schsh/nssdatabases

diff --git a/schsh b/schsh
index 270691e3b77844a1acc94086b985d0f848e7e100..e9464de65dfd0309d025af018be937e9efac1612 100755 (executable)
--- a/schsh
+++ b/schsh
@@ -58,4 +58,4 @@ else:
        logquit("Invalid arguments for schsh: "+str(sys.argv))
 
 assert len(run) > 0
        logquit("Invalid arguments for schsh: "+str(sys.argv))
 
 assert len(run) > 0

-os.execl("/usr/bin/schroot", "/usr/bin/schroot", "-c", "user-"+get_username(), "-d", "/data", "--", *run)
+os.execl("/usr/bin/schroot", "/usr/bin/schroot", "-c", "schsh-"+get_username(), "-d", "/data", "--", *run)