From 5e639998dbbff36f5555b4ab9798cefaeae8bca2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 22 Oct 2013 09:35:18 -0500
Subject: LinHES-config: replace pacman -f with --force as pacman 4.1 doesn't
 support -f.

---
 abs/core/LinHES-config/PKGBUILD                | 8 ++++----
 abs/core/LinHES-config/install_db_chroot.sh    | 2 +-
 abs/core/LinHES-config/restore_km_db_chroot.sh | 2 +-
 abs/core/LinHES-config/soundconfig.sh          | 4 ++--
 abs/core/LinHES-config/startx                  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 6a8cba3..d4983bb 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=8.0
-pkgrel=10
+pkgrel=11
 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'
@@ -141,12 +141,12 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
          'fda01259a4bc74d83c9092d338bd247a'
          '768504ef10ecd11a22875ccea9fcf62b'
          'f73d6d6f98839e900cb6685bf5dc4eae'
-         '408688e3bcb2cefe512f9a89863137c8'
+         'b8becf69d4309b938ceba3178c799270'
          '2a7f3b34e522acfd08283b86c8926aba'
          'b596d2e3779a434435bc0f0277b1ba3e'
          '5012fbd31d205a6d6b0a1d8caf3eba8f'
          '157e73d0f90d7b306aba8f5921aeedd3'
-         'a6faa20d905e2fd92ce79acab044b759'
+         'a805504b6593eaa416fe5f32cd4d1b9e'
          '8ba06c2ce6129371548cc360ccca27f8'
          '5f890ea9bda6aef652d2560ca19dac07'
          'ab2aa42c2947148c2b1cac0ade6d1d55'
@@ -154,7 +154,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
          'f6a935c35123fdc7c259c01cbc794a64'
          '5e865cc04fe5de8a39d9c1e377fc4ebe'
          'd3490e93f313bbbcbc6c3693c56b9c17'
-         '3d1e4a119f38cff0498bf8a67e94e4b3'
+         'e959df98947eb0d2ea64ff616b61aab5'
          '2506860a416e1988934225d80d501c2c'
          'c0549457750c4f8e8038d904a0f3012a'
          '075fe16ef92621ce31f41df5c5577daf'
diff --git a/abs/core/LinHES-config/install_db_chroot.sh b/abs/core/LinHES-config/install_db_chroot.sh
index 272b556..47de18c 100644
--- a/abs/core/LinHES-config/install_db_chroot.sh
+++ b/abs/core/LinHES-config/install_db_chroot.sh
@@ -12,7 +12,7 @@ echo "install_db_chroot hostname is $hostname"
 #myhost=`cat /etc/hostname`
 
 #mount -t proc none /proc
-pacman --noconfirm -Sf mysql
+pacman --noconfirm -S --force mysql
 /etc/rc.d/mysqld
 
 status=1
diff --git a/abs/core/LinHES-config/restore_km_db_chroot.sh b/abs/core/LinHES-config/restore_km_db_chroot.sh
index e72e8c2..132dae3 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 -Sf mysql
+        pacman --noconfirm -S --force 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 b9eb906..f682465 100755
--- a/abs/core/LinHES-config/soundconfig.sh
+++ b/abs/core/LinHES-config/soundconfig.sh
@@ -30,7 +30,7 @@ function load_alsa() {
     echo "   uncompressing ALSA modules"
     tar -xf sound-preoss.tar.bz2
 #    echo "   installing alsa-lib"
-    #pacman -Sf --noconfirm  alsa-lib
+    #pacman -S --force --noconfirm  alsa-lib
 
     echo "   uninstalling oss"
     pacman -R --noconfirm oss
@@ -75,7 +75,7 @@ function installOSS {
     pacman -Q oss 2>/dev/null
     if [  ! $? = 0 ]
     then
-        pacman --noconfirm -Sf oss
+        pacman --noconfirm -S --force oss
     fi
     soundon
     add_service.sh oss
diff --git a/abs/core/LinHES-config/startx b/abs/core/LinHES-config/startx
index 75ba06a..b59dc7f 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 -Sf --noconfirm tightvnc
+    pacman -S --force --noconfirm tightvnc
     cd /root
     mkdir .vnc
     echo mythvantage |vncpasswd -f > /root/.vnc/passwd
-- 
cgit v0.12

