diff options
Diffstat (limited to 'abs/core')
| -rwxr-xr-x | abs/core/LinHES-config/PKGBUILD | 10 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_common.py | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_supplemental.py | 2 | ||||
| -rw-r--r-- | abs/core/LinHES-config/restore_km_db_chroot.sh | 2 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/soundconfig.sh | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/startx | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index fae3b9b..eb0ed8c 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,5 +1,5 @@ pkgname=LinHES-config -pkgver=8.6.1 +pkgver=8.7.0 pkgrel=1 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" @@ -159,7 +159,7 @@ md5sums=('49952a2375b8ee53d8673473f22f8d12' 'cf5164ae463a585897c7a1bfa1dc19d2' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' - '1f58c0393a131f4a8f9a84b3fe08a7e4' + 'e6db15d2e088e07af7a7922207380e5e' 'b38d98bed2d0532a3a2c96d04681941e' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' @@ -167,11 +167,11 @@ md5sums=('49952a2375b8ee53d8673473f22f8d12' 'f6a935c35123fdc7c259c01cbc794a64' 'ccf7b6a8d0ccf2360a57384b45437e58' 'd3490e93f313bbbcbc6c3693c56b9c17' - 'e959df98947eb0d2ea64ff616b61aab5' + '4fbc72a9cf9e9351a76fd530f90794b2' '2506860a416e1988934225d80d501c2c' '3ff600acf742700bb55b719dab863d15' 'f57200b66b6cf384f2c784b3e4303503' - 'b3505d27b65a4d35e252e2d256909e80' + '82f41e33377ccc4ab35dcbaabd5d2aab' 'b845de3e05c1734cce4b9ac5e8f1baaf' '02b4378b17bca6bebdcc2258a80dfc6b' '8b7dce4a3a0a281fa6656aa8781a648e' @@ -181,7 +181,7 @@ md5sums=('49952a2375b8ee53d8673473f22f8d12' '336f08aed2e3c0b9fd09563933d54735' '68ca2af6fb9dba32ed668b9ae1564a01' '8be8ce5f1d8522b1cde12d34840865c2' - '80685e047993b00161be29e3580f3a40' + '2a9742d4b0b94ece2e81c9204883eb6f' '0e1c98392887b6efcb3f8b04ead7c4f9' '3d84d2b508a73733e8d593e551b21081' '781f161a79c3188a31c8615b8258b241' diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py index 367a067..fd97741 100755 --- a/abs/core/LinHES-config/mv_common.py +++ b/abs/core/LinHES-config/mv_common.py @@ -236,7 +236,7 @@ def pacinstall(pkg): elif pkg == "xymonclient": if os.path.exists('/home/xymon/client'): - cmd='''pacman --noconfirm --dbonly -Sdd --force xymonclient''' + cmd='''pacman --noconfirm --dbonly -Sdd xymonclient''' runcmd(cmd) if not pkg_blacklist_check(pkg): @@ -244,7 +244,7 @@ def pacinstall(pkg): logging.info(" %s is already installed, will not install",pkg) else: logging.info(" Installing %s",pkg) - cmd ='''pacman --noconfirm -S --force %s ''' %pkg + cmd ='''pacman --noconfirm -S %s ''' %pkg runcmd(cmd) else: logging.info(" %s is blacklisted, will not install",pkg) diff --git a/abs/core/LinHES-config/mv_supplemental.py b/abs/core/LinHES-config/mv_supplemental.py index 50a6c1a..54cbfaa 100755 --- a/abs/core/LinHES-config/mv_supplemental.py +++ b/abs/core/LinHES-config/mv_supplemental.py @@ -46,7 +46,7 @@ def supplemental(systemconfig,this_is_install = False): logging.info(" Installing supplemental system\n") if this_is_install == True: if os.path.exists('/home/xymon/server'): - cmd='''pacman --noconfirm --dbonly -Sdd --force xymonserver''' + cmd='''pacman --noconfirm --dbonly -Sdd xymonserver''' mv_common.runcmd(cmd) cmd='''/usr/LH/bin/install_supplemental_service.sh''' diff --git a/abs/core/LinHES-config/restore_km_db_chroot.sh b/abs/core/LinHES-config/restore_km_db_chroot.sh index 132dae3..170dd9e 100644 --- a/abs/core/LinHES-config/restore_km_db_chroot.sh +++ b/abs/core/LinHES-config/restore_km_db_chroot.sh @@ -11,7 +11,7 @@ DBFILE=$1 if [ $SystemType = "Master_backend" -o $SystemType = "Standalone" ] then #restore database - pacman --noconfirm -S --force mysql + pacman --noconfirm -S mysql status=1 mysqlstatus=1 while [ ! $status = 0 ] diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh index e6aaa41..3376ca5 100755 --- a/abs/core/LinHES-config/soundconfig.sh +++ b/abs/core/LinHES-config/soundconfig.sh @@ -64,12 +64,12 @@ function installOSS { pacman -Q oss 2>/dev/null if [ ! $? = 0 ] then - pacman --noconfirm -S --force oss + pacman --noconfirm -S oss fi soundon if [ ! $? = 0 ] then - pacman --noconfirm -S --force gcc make binutils + pacman --noconfirm -S gcc make binutils soundon fi add_service.sh oss diff --git a/abs/core/LinHES-config/startx b/abs/core/LinHES-config/startx index b59dc7f..75befdc 100755 --- a/abs/core/LinHES-config/startx +++ b/abs/core/LinHES-config/startx @@ -18,7 +18,7 @@ then startx /root/live-install.sh -- -logverbose 6 -config /root/xorg.conf.install -allowMouseOpenFail else #VNC - pacman -S --force --noconfirm tightvnc + pacman -S --noconfirm tightvnc cd /root mkdir .vnc echo mythvantage |vncpasswd -f > /root/.vnc/passwd |