summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Luka Šijanec <anton@sijanec.eu>2023-11-30 22:42:57 +0100
committerAnton Luka Šijanec <anton@sijanec.eu>2023-11-30 22:42:57 +0100
commit19ceb27e9ced352985a7cbc1df662d20db051648 (patch)
tree8e484d8493da3f5a76e6d3d9589987178d603359
parentchrootjelka (diff)
downloadr-19ceb27e9ced352985a7cbc1df662d20db051648.tar
r-19ceb27e9ced352985a7cbc1df662d20db051648.tar.gz
r-19ceb27e9ced352985a7cbc1df662d20db051648.tar.bz2
r-19ceb27e9ced352985a7cbc1df662d20db051648.tar.lz
r-19ceb27e9ced352985a7cbc1df662d20db051648.tar.xz
r-19ceb27e9ced352985a7cbc1df662d20db051648.tar.zst
r-19ceb27e9ced352985a7cbc1df662d20db051648.zip
-rwxr-xr-xprog/jelka/chroot.sh2
-rwxr-xr-xprog/jelka/wrapper.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/prog/jelka/chroot.sh b/prog/jelka/chroot.sh
index f1db05b..cf6a1da 100755
--- a/prog/jelka/chroot.sh
+++ b/prog/jelka/chroot.sh
@@ -4,7 +4,7 @@ mkdir -p $2
mount -t tmpfs -o nr_blocks=1,mode=0755 tmp $2
if [ x$1 = xstart ]
then
- for i in /bin /dev/null /etc /lib /lib64 /usr
+ for i in /bin /dev/null /etc /lib /usr
do
[ -d $i ] && mkdir -p $2/$i || { mkdir -p $2/`rev <<<$i | cut -d/ -f2- | rev` && touch $2/$i; }
mount --bind -onosuid,ro $i $2/$i
diff --git a/prog/jelka/wrapper.py b/prog/jelka/wrapper.py
index ad2f11d..4e496c7 100755
--- a/prog/jelka/wrapper.py
+++ b/prog/jelka/wrapper.py
@@ -37,7 +37,7 @@ buffer = mmap.mmap(shmf.fileno(), 0)
cwd = "/"
r, w = os.pipe()
args = ["/jelka/vzorci/" + argv[1], str(w)]
-pw_record = pwd.getpwnam("z")
+pw_record = pwd.getpwnam("umetnik")
os.chown("chroot/dev/shm/jelka", 0, pw_record.pw_gid)
os.chmod("chroot/dev/shm/jelka", 0o660)
env = os.environ.copy()