From: Ralf Jung Date: Wed, 19 Feb 2014 18:37:18 +0000 (+0100) Subject: Support 64bit systems X-Git-Url: https://git.ralfj.de/schsh.git/commitdiff_plain/400448724b88cf4b6a294261309819d35f4d3a4f?hp=e279c0b1c8705095756f11a3b7cc0a64a0474144 Support 64bit systems --- diff --git a/Makefile b/Makefile index 5700d33..83397e7 100644 --- a/Makefile +++ b/Makefile @@ -5,3 +5,4 @@ install: install -o root -g root schsh makeschsh $(TARGET)/bin/ install -o root -g root -d $(SCHROOT)/schsh/ install -o root -g root -m 644 schroot/schsh/* $(SCHROOT)/schsh/ + install -o root -g root -d /var/lib/schsh/ diff --git a/makeschsh b/makeschsh index 61b37f6..dc31830 100755 --- a/makeschsh +++ b/makeschsh @@ -32,13 +32,14 @@ profile=schsh setup.fstab=schsh/{0}.fstab """.format(name, chroot) with open("/etc/schroot/schsh/"+name+".fstab", "w") as f: - print >>f, """# -/bin \t/bin \tnone \trw,bind \t0 \t0 -/lib \t/lib \tnone \trw,bind \t0 \t0 -/usr/bin \t/usr/bin \tnone \trw,bind \t0 \t0 -/usr/lib \t/usr/lib \tnone \trw,bind \t0 \t0 -/home/{0}/data\t/data \tnone \trw,bind \t0 \t0 -""".replace(' ', '').format(name) # need to remove spaces so schroot does not complain + # no spaces, schroot does not like them + print >>f, "# " + # system folders + for folder in ("/bin", "/lib", "/lib64", "/usr/bin", "/usr/lib", "/usr/lib64"): + if os.path.exists(folder): + print >>f, "{0}\t{0}\tnone\trw,bind\t0\t0".format(folder) + # user folder + print >>f, "/home/{0}/data\t/data\tnone\trw,bind\t0\t0".format(name) # setup the schroot directory os.mkdir(chroot)