Skip to content

Commit 382b647

Browse files
committed
Fix errors in proot
1 parent 60df6ef commit 382b647

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

plugins/envsetup

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ do_chroot_proot_ae() {
380380
shift
381381
local cmd_string=$*
382382
local root_fs_path=${chroot_dir}
383-
local container_user=root
384383

385384
unset LD_PRELOAD
386385
proot \
@@ -404,15 +403,13 @@ do_chroot_proot_ae() {
404403
--root-id \
405404
--cwd=/root -L \
406405
--kernel-release=5.4.0-faked \
407-
--kill-on-exit \
408406
--rootfs="${root_fs_path}" \
409407
-w /root \
410408
/usr/bin/env -i \
411409
HOME=/root \
412410
PATH=/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
413411
TERM="$TERM" \
414412
LANG=C.UTF-8 \
415-
/bin/su -l $container_user \
416413
$cmd_string
417414

418415
}

plugins/gz-packer.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
target=$1
44

55
tar \
6-
--exclude={/dev,/apex,/vendor,/system,/sdcard} \
6+
--exclude={/data,/dev,/apex,/vendor,/system,/sdcard} \
77
--exclude={/proc/*,/sys/*,/tmp/*,/mnt/*,/media/*,/lost+found/*} \
88
--exclude="*.l2s.*" \
99
--exclude=/${0} \
@@ -13,4 +13,4 @@ tar \
1313
-cpf \
1414
- / -P \
1515
| pv -s $(($(du -skx / | awk '{print $1}') * 1024)) |\
16-
gzip --best > "${target}".tar.gz
16+
gzip --best > /"${target}".tar.gz

plugins/j-packer.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
target=$1
44

55
tar \
6-
--exclude={/dev,/apex,/vendor,/system,/sdcard} \
6+
--exclude={/data,/dev,/apex,/vendor,/system,/sdcard} \
77
--exclude={/proc/*,/sys/*,/tmp/*,/mnt/*,/media/*,/lost+found/*} \
88
--exclude="*.l2s.*" \
99
--exclude=/${0} \
@@ -13,4 +13,4 @@ tar \
1313
-cpf \
1414
- / -P \
1515
| pv -s $(($(du -skx / | awk '{print $1}') * 1024)) |\
16-
bzip2 --best > "${target}".tar.xz
16+
bzip2 --best > /"${target}".tar.xz

plugins/lz-packer.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
target=$1
44

55
tar \
6-
--exclude={/dev,/apex,/vendor,/system,/sdcard} \
6+
--exclude={/data,/dev,/apex,/vendor,/system,/sdcard} \
77
--exclude={/proc/*,/sys/*,/tmp/*,/mnt/*,/media/*,/lost+found/*} \
88
--exclude="*.l2s.*" \
99
--exclude=/${0} \
@@ -13,4 +13,4 @@ tar \
1313
-cpf \
1414
- / -P \
1515
| pv -s $(($(du -skx / | awk '{print $1}') * 1024)) |\
16-
lz4 -9 > "${target}".tar.lz # use high compression
16+
lz4 -9 > /"${target}".tar.lz # use high compression

0 commit comments

Comments
 (0)