From: Ralf Jung <post@ralfj.de>
Date: Thu, 13 Feb 2014 14:58:42 +0000 (+0100)
Subject: better names for some files and things
X-Git-Url: https://git.ralfj.de/schsh.git/commitdiff_plain/6dfe0e9d89af3b03e9d199fd3ae086ab16aae77a

better names for some files and things
---

diff --git a/Makefile b/Makefile
index bd9e5b0..5700d33 100644
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,5 @@ SCHROOT := /etc/schroot
 
 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 0dbb0aa..61b37f6 100755
--- a/makeschsh
+++ b/makeschsh
@@ -23,15 +23,15 @@ def setup(name):
 	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}
-profile=user
-setup.fstab=user/user-{0}.fstab
+profile=schsh
+setup.fstab=schsh/{0}.fstab
 """.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
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 270691e..e9464de 100755
--- a/schsh
+++ b/schsh
@@ -58,4 +58,4 @@ else:
 	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)