Skip to content

Commit 5919024

Browse files
committed
Fix hostexec hang on legacy forking
1 parent faf1902 commit 5919024

4 files changed

Lines changed: 19 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# v0.80.2
2+
3+
* Fix hostexec hang on legacy forking
4+
15
# v0.80.1
26

37
* Update [lwrun](https://github.com/VHSgunzo/runimage/releases/download/v0.40.1) container `v0.40.1`

lux-wine

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ print_input() {
315315
check_wine_pids() {
316316
unset WINE_PIDS CHK_WINE_PIDS PROC_EXES
317317
if [ "$INSIDE_RUNIMAGE" == 1 ]
318-
then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
318+
then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null' </dev/null)"
319319
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
320320
fi
321321
if [[ "$WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]] \
@@ -362,7 +362,7 @@ check_luwine_sh_pid() {
362362
check_exes() {
363363
unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE PROC_EXES
364364
if [ "$INSIDE_RUNIMAGE" == 1 ]
365-
then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
365+
then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null' </dev/null)"
366366
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
367367
fi
368368
RUN_EXES="$(ps -o pid=,cmd= -p $(echo "$PROC_EXES"|\

lwrap/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pkgname='lwrap'
44
pkgver='0.80'
5-
pkgrel='1'
5+
pkgrel='2'
66
pkgdesc='Lux Wine wrapper for RunImage container'
77
arch=('x86_64')
88
url='https://github.com/VHSgunzo/lux-wine'
@@ -34,7 +34,7 @@ depends=(
3434
'libmpeg2' 'twolame' 'lib32-twolame' 'gst-plugin-msdk' 'lib32-libdv' 'libdv' 'GE-Proton'
3535
'xxd-standalone' 'obs-vkcapture-lw' 'lib32-obs-vkcapture-lw' 'egl-wayland' 'gstreamer-vaapi'
3636
'moninfo' 'perl-image-exiftool' 'xorg-xlsfonts' 'firefox' 'controllermap' 'libayatana-appindicator'
37-
'vulkan-nouveau' 'lib32-vulkan-nouveau' 'lib32-amdvlk' 'amdvlk'
37+
'vulkan-nouveau' 'lib32-vulkan-nouveau'
3838
)
3939
optdepends=(
4040
'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'

lwrap/lwrap.install

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,20 @@ post_upgrade() {
3838
pac -Q zenity 2>/dev/null|grep -q '4\.[0-9]\.[0-9]' && \
3939
pkg_tool 'yes|sudo downgrade zenity=3.44.2'
4040

41-
pac -Q chromium &>/dev/null && \
42-
pkg_tool 'yes|pac -Rsndd chromium'
41+
if [ "$RUNIMAGE_VERSION" == '0.39.1' ]
42+
then
43+
pac -Q chromium &>/dev/null && \
44+
pkg_tool 'yes|pac -Rsndd chromium'
4345

44-
pac -Q amdvlk &>/dev/null && \
45-
pkg_tool 'yes|pac -Rsndd amdvlk'
46+
pac -Q amdvlk &>/dev/null && \
47+
pkg_tool 'yes|pac -Rsndd amdvlk'
4648

47-
pac -Q lib32-amdvlk &>/dev/null && \
48-
pkg_tool 'yes|pac -Rsndd lib32-amdvlk'
49+
pac -Q lib32-amdvlk &>/dev/null && \
50+
pkg_tool 'yes|pac -Rsndd lib32-amdvlk'
4951

50-
pac -Q glibc-eac lib32-glibc-eac &>/dev/null||\
51-
pkg_tool 'yes|pac -Sy glibc-eac lib32-glibc-eac'
52+
pac -Q glibc-eac lib32-glibc-eac &>/dev/null||\
53+
pkg_tool 'yes|pac -Sy glibc-eac lib32-glibc-eac'
54+
fi
5255

5356
return 0
5457
}

0 commit comments

Comments
 (0)