coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-16 13:16:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

init.sh: put TMPDIR inside xbmkpwd, not /tmp

Browse Source 
This way, all operations will be done inside the xbmk
work directory. This is being done, so that I can then
reliably sandybox certain commands in future commits,
for example the "rm" command.

This will also allow me to unify the location of all
temporary files, in future commits. I previously used
the /tmp directory because it's tmpfs-based on many
setups, and this is great for performance. However, in
practise, I never noticed any difference in performance
when benchmarking it (testing /tmp on-disk versus tmpfs).

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-09-02 06:02:57 +01:00
parent 8a8be1dec9
commit 64b69907ab
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -44,3 +44,4 @@
/r /r
/e /e
/xbmkpath/ /xbmkpath/
/xbmkwd/
include/init.sh
+11 -9
View File
@@ -15,15 +15,17 @@ projectsite="https://libreboot.org/"
eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \ eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
datadir version xbmkpwd relname xbmkpwd xbtmp python pyver xbloc \ datadir version xbmkpwd relname xbmkpwd xbtmp python pyver xbloc \
xbmklock cvxbmk cvchk xbmkpath is_child`" xbmklock cvxbmk cvchk xbmkpath is_child basetmp`"
xbmk_init() xbmk_init()
{ {
xbmkpwd="`pwd`" || err "Cannot generate PWD" xbmkpwd="`pwd`" || err "Cannot generate PWD"
xbloc="$xbmkpwd/tmp" xbloc="$xbmkpwd/tmp"
xbmklock="$xbmkpwd/lock" xbmklock="$xbmkpwd/lock"
basetmp="$xbmkpwd/xbmkwd"
export PWD="$xbmkpwd" export PWD="$xbmkpwd"
x_ mkdir -p "$basetmp"
[ $# -gt 0 ] && [ "$1" = "dependencies" ] && x_ xbmkpkg "$@" && exit 0 [ $# -gt 0 ] && [ "$1" = "dependencies" ] && x_ xbmkpkg "$@" && exit 0
@@ -92,16 +94,16 @@ xbmk_child_set_tmp()
{ {
eval `setvars "" xbtmp badtmp xbtmpchk xbtmpname` eval `setvars "" xbtmp badtmp xbtmpchk xbtmpname`
[ -z "${TMPDIR+x}" ] && export TMPDIR="/tmp" [ -z "${TMPDIR+x}" ] && export TMPDIR="$basetmp"
# extremely pedantic safety checks on TMPDIR # extremely pedantic safety checks on TMPDIR
xbtmpchk="`findpath "$TMPDIR" || err`" || err xbtmpchk="`findpath "$TMPDIR" || err`" || err
[ "$xbtmpchk" = "${xbtmpchk#/tmp/}" ] && \ [ "$xbtmpchk" = "${xbtmpchk#"$basetmp/"}" ] && \
badtmp="not a subdirectory in /tmp" badtmp="not a subdirectory in $basetmp"
[ -z "$badtmp" ] && xbtmpname="${xbtmpchk#/tmp/}" && \ [ -z "$badtmp" ] && xbtmpname="${xbtmpchk#"$basetmp/"}" && \
[ -z "$xbtmpchk" ] && badtmp="name after /tmp is empty" [ -z "$xbtmpchk" ] && badtmp="name after $basetmp is empty"
[ -z "$badtmp" ] && [ "$xbtmpname" != "${xbtmpname#*/}" ] && \ [ -z "$badtmp" ] && [ "$xbtmpname" != "${xbtmpname#*/}" ] && \
badtmp="'$TMPDIR' is a subdirectory in a subdir of /tmp" badtmp="'$TMPDIR' is a subdirectory in a subdir of $basetmp"
[ -z "$badtmp" ] && [ -L "$xbtmpchk" ] && badtmp="is a symlink" [ -z "$badtmp" ] && [ -L "$xbtmpchk" ] && badtmp="is a symlink"
[ -z "$badtmp" ] && [ ! -d "$xbtmpchk" ] && \ [ -z "$badtmp" ] && [ ! -d "$xbtmpchk" ] && \
badtmp="not a directory" badtmp="not a directory"
@@ -124,12 +126,12 @@ xbmk_child_set_tmp()
xbmk_parent_check_tmp() xbmk_parent_check_tmp()
{ {
export TMPDIR="/tmp" export TMPDIR="$basetmp"
xbmklist="`mktemp || err "can't make tmplist"`" || err xbmklist="`mktemp || err "can't make tmplist"`" || err
x_ rm -f "$xbmklist" x_ rm -f "$xbmklist"
x_ touch "$xbmklist" x_ touch "$xbmklist"
for xtmpdir in /tmp/xbmk_*; do for xtmpdir in "$basetmp"/xbmk_*; do
[ -e "$xtmpdir" ] || continue [ -e "$xtmpdir" ] || continue
printf "%s\n" "$xtmpdir" >> "$xbmklist" || \ printf "%s\n" "$xtmpdir" >> "$xbmklist" || \
err "can't write '$xtmpdir' to file: '$xbmklist'"; : err "can't write '$xtmpdir' to file: '$xbmklist'"; :