From b36d08a3d75a3093bf2e174ad5ba49ab4cace160 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 15 Jun 2018 21:53:12 +0000
Subject: LinHES-config: mv_install.py: us fuser instead of lsof to kill
/new_boot programs
---
abs/core/LinHES-config/PKGBUILD | 6 +++---
abs/core/LinHES-config/mv_install.py | 11 +++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index f07539a..5f7e92b 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
-pkgver=8.5.1
-pkgrel=4
+pkgver=8.5.2
+pkgrel=1
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -145,7 +145,7 @@ package() {
install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
}
-md5sums=('518c868141fe443e9258144c029ed3f9'
+md5sums=('7d8581ac5260617630078f2206d33117'
'bee51ac2c232ab134eec127f5c8846ad'
'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
'2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index f414942..89dac8c 100644
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -82,10 +82,13 @@ def kill_dhcp_chroot():
pass
#force kill
try:
- cmd = "lsof -t /new_boot|xargs kill -9"
+ #cmd = "lsof -t /new_boot|xargs kill -9"
+ #newer versions of lsof show /dev/pts bind mounts
+ #even after they are umounted
+ cmd = "fuser -mk /new_boot"
runcmd(cmd)
except:
- print " !!!Problem killing all /new_boot pids"
+ logging.debug("!!!Problem killing all /new_boot pids")
@@ -218,7 +221,7 @@ def mysqldb(cmd, inchroot):
if cmd == "start":
cmd = "chroot /new_boot /etc/rc.d/mysqld start"
elif cmd == "stop":
- cmd = " chroot /new_boot /etc/rc.d/mysqld stop"
+ cmd = "chroot /new_boot /etc/rc.d/mysqld stop"
else:
if cmd == "start":
cmd = "systemctl start mysqld.service"
@@ -1653,7 +1656,7 @@ def full_install(hostoptions):
else:
double_mount(fe_only=True)
#move_myth_home("restore")
-# Need to check for to touch /tmp/.dbsysfailed
+ #Need to check for to touch /tmp/.dbsysfailed
#cmd = " chroot %s %s/bin/myth_settings_wrapper.sh -c restore -t syssettings " %(data_config.MOUNTPOINT, MVROOT)
#runcmd(cmd)
if ( 'x' == '1' ):
--
cgit v0.12