Fix hostexec hang on legacy forking

VHSgunzo · Jan 17, 2025 · 5919024 · 5919024
1 parent faf1902
commit 5919024
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v0.80.2
+
+* Fix hostexec hang on legacy forking
+
 # v0.80.1
 
 * Update [lwrun](https://github.com/VHSgunzo/runimage/releases/download/v0.40.1) container `v0.40.1`

diff --git a/lux-wine b/lux-wine
@@ -315,7 +315,7 @@ print_input() {
 check_wine_pids() {
     unset WINE_PIDS CHK_WINE_PIDS PROC_EXES
     if [ "$INSIDE_RUNIMAGE" == 1 ]
-        then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
+        then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null' </dev/null)"
         else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
     fi
     if [[ "$WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]] \
@@ -362,7 +362,7 @@ check_luwine_sh_pid() {
 check_exes() {
     unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE PROC_EXES
     if [ "$INSIDE_RUNIMAGE" == 1 ]
-        then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null')"
+        then PROC_EXES="$(hostexec sh -c 'ls -l /proc/*/exe 2>/dev/null' </dev/null)"
         else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
     fi
     RUN_EXES="$(ps -o pid=,cmd= -p $(echo "$PROC_EXES"|\

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

diff --git a/lwrap/lwrap.install b/lwrap/lwrap.install
@@ -38,17 +38,20 @@ post_upgrade() {
     pac -Q zenity 2>/dev/null|grep -q '4\.[0-9]\.[0-9]' && \
     pkg_tool 'yes|sudo downgrade zenity=3.44.2'
 
-    pac -Q chromium &>/dev/null && \
-    pkg_tool 'yes|pac -Rsndd chromium'
+    if [ "$RUNIMAGE_VERSION" == '0.39.1' ]
+        then
+            pac -Q chromium &>/dev/null && \
+            pkg_tool 'yes|pac -Rsndd chromium'
 
-    pac -Q amdvlk &>/dev/null && \
-    pkg_tool 'yes|pac -Rsndd amdvlk'
+            pac -Q amdvlk &>/dev/null && \
+            pkg_tool 'yes|pac -Rsndd amdvlk'
 
-    pac -Q lib32-amdvlk &>/dev/null && \
-    pkg_tool 'yes|pac -Rsndd lib32-amdvlk'
+            pac -Q lib32-amdvlk &>/dev/null && \
+            pkg_tool 'yes|pac -Rsndd lib32-amdvlk'
 
-    pac -Q glibc-eac lib32-glibc-eac &>/dev/null||\
-    pkg_tool 'yes|pac -Sy glibc-eac lib32-glibc-eac'
+            pac -Q glibc-eac lib32-glibc-eac &>/dev/null||\
+            pkg_tool 'yes|pac -Sy glibc-eac lib32-glibc-eac'
+    fi
 
     return 0
 }