summaryrefslogtreecommitdiffstats
path: root/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686
diff options
context:
space:
mode:
Diffstat (limited to 'build_tools/larch8/larch0/profiles/linhes-remote-testing-i686')
-rwxr-xr-xbuild_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh1
-rw-r--r--build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/nouveau.conf1
-rwxr-xr-xbuild_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf2
-rwxr-xr-xbuild_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/rc.local9
4 files changed, 8 insertions, 5 deletions
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh
index ad83b2c..e635c0e 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh
@@ -3,6 +3,7 @@ echo "larch5" > /etc/hostname
useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users
cp -rvpf /.post_process/home/mythtv /home/
cp -rvpf /.post_process/home/mythtv/.fluxbox /root
+cp -vpf /.post_process/nouveau.conf /etc/modprobe.d/nouveau.conf
chown -R mythtv.mythtv /home/mythtv/
chown -R mythtv.mythtv /myth
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/nouveau.conf b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/nouveau.conf
new file mode 100644
index 0000000..31075c0
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/nouveau.conf
@@ -0,0 +1 @@
+blacklist nouveau
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf
index 9c17944..7ab2209 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf
@@ -48,7 +48,7 @@ else
fi
# Module Blacklist - modules in this list will never be loaded by udev
-MOD_BLACKLIST_=($ALSABLACKLIST !snd-pcsp )
+MOD_BLACKLIST_=($ALSABLACKLIST !snd-pcsp !nouveau)
#
# Modules to load at boot-up (in this order)
# - prefix a module with a ! to blacklist it
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/rc.local b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/rc.local
index 2d488a2..2379f2f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/rc.local
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/rc.local
@@ -33,9 +33,6 @@ mythconverg_check
status=$?
while [ ! $status = 0 ]
do
- ((ATTEMPT=ATTEMPT+1))
- /etc/rc.d/mysqld stop
- sleep 2
/etc/rc.d/mysqld start
mysqlstatus=$?
if [ $mysqlstatus = 0 ]
@@ -43,7 +40,11 @@ do
mysql_check && install_db
mythconverg_check
status=$?
- fi
+ else
+ ((ATTEMPT=ATTEMPT+1))
+ /etc/rc.d/mysqld stop
+ sleep 2
+ fi
if [ $ATTEMPT = 20 ]
then
printhl " Could not start mysql or install mythconverg within 20 attempts"