summaryrefslogtreecommitdiffstats
path: root/build_tools/archiso
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2013-10-22 14:05:58 (GMT)
committerBritney Fransen <brfransen@gmail.com>2013-10-22 14:05:58 (GMT)
commit269a45e067c0b3996632205faa89774cc2256a40 (patch)
treebba0203bb1ce7820ad6e9f2073539388b205c03a /build_tools/archiso
parenta4434f5669adb7cca6f5295d02a415c46b38a6f7 (diff)
downloadlinhes_dev-269a45e067c0b3996632205faa89774cc2256a40.zip
post_process go.sh and root startx: pacman 4.1 doesn't use -f but requires --force.
Diffstat (limited to 'build_tools/archiso')
-rwxr-xr-xbuild_tools/archiso/mythvantage/root-image/root/.post_process/go.sh3
-rwxr-xr-xbuild_tools/archiso/mythvantage/root-image/root/startx2
2 files changed, 2 insertions, 3 deletions
diff --git a/build_tools/archiso/mythvantage/root-image/root/.post_process/go.sh b/build_tools/archiso/mythvantage/root-image/root/.post_process/go.sh
index 602c06a..49ccad8 100755
--- a/build_tools/archiso/mythvantage/root-image/root/.post_process/go.sh
+++ b/build_tools/archiso/mythvantage/root-image/root/.post_process/go.sh
@@ -4,8 +4,7 @@
. /usr/MythVantage/bin/mv_config.py
PD="/root/.post_process"
-#pacman -Sff --noconfirm runit-scripts
-pacman -S --noconfirm runit-scripts
+pacman -S --force --noconfirm runit-scripts
HDIR=`dirname $MYTHHOME`
mkdir -p $HDIR
diff --git a/build_tools/archiso/mythvantage/root-image/root/startx b/build_tools/archiso/mythvantage/root-image/root/startx
index 829f1db..068263f 100755
--- a/build_tools/archiso/mythvantage/root-image/root/startx
+++ b/build_tools/archiso/mythvantage/root-image/root/startx
@@ -16,7 +16,7 @@ then
startx /root/LinHES-install.sh -- -logverbose 6 -allowMouseOpenFail 2>/tmp/x.log
else
#VNC
- pacman -Sf --noconfirm tigervnc
+ pacman -S --force --noconfirm tigervnc
/etc/rc.d/dbus start
cp -f $TEMPLATES/vnc.service /etc/avahi/services/
/etc/rc.d/avahi-daemon start