summaryrefslogtreecommitdiffstats
path: root/build_tools/clarch/larch/profiles/i686-testing-local
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-04-10 15:56:58 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-04-10 15:56:58 (GMT)
commitd5edadbefb6dfb1facd113127bc68810f6109aa3 (patch)
treec20fc156c12a3caee2edd58422c40174454bce7e /build_tools/clarch/larch/profiles/i686-testing-local
parentb26720a8793017e9c5c5812581b34ae41acede76 (diff)
downloadlinhes_dev-d5edadbefb6dfb1facd113127bc68810f6109aa3.zip
-set the correct number of steps for splash when installing.
-change splash to 800x600
Diffstat (limited to 'build_tools/clarch/larch/profiles/i686-testing-local')
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg2
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst4
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.bootsteps1
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.conf8
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.shutdownsteps1
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local25
6 files changed, 32 insertions, 9 deletions
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg
index 31023c0..646b173 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg
@@ -15,7 +15,7 @@ MENU TITLE LinHES: The Linux Home Entertainment System
label linux
MENU LABEL LinHES (default).
kernel vmlinuz
-append initrd=larch.img vga=792 quiet splash=silent,theme:linhes console=tty1
+append initrd=larch.img vga=0x314 quiet splash=silent,theme:linhes console=tty1
label linux-nosplash
MENU LABEL LinHES without splash screen.
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst
index ab2bc95..8a8e3b2 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/menu.lst
@@ -43,13 +43,13 @@ initrd /boot/kernel26.img
# (1) bootsplash
title LinHes-splashy
root (hd0,0)
-kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit quiet vga=0x318 splash=silent,theme:linhes console=tty1
+kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit quiet vga=0x314 splash=silent,theme:linhes console=tty1
initrd /boot/kernel26.img
# (2) noautologin
title LinHES-nologin
root (hd0,0)
-kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit quiet vga=0x318 splash=silent,theme:linhes console=tty1 noautologin
+kernel /boot/vmlinuz26 root=/dev/hda1 ro init=/sbin/runit quiet vga=0x314 splash=silent,theme:linhes console=tty1 nox
initrd /boot/kernel26.img
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.bootsteps b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.bootsteps
new file mode 100644
index 0000000..64bb6b7
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.bootsteps
@@ -0,0 +1 @@
+30
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.conf b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.conf
new file mode 100644
index 0000000..ddd88f8
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.conf
@@ -0,0 +1,8 @@
+#
+# fbsplash.conf
+#
+
+THEMES="linhes"
+SPLASH_TTYS="1 2 3 4 5 6"
+
+#EOF
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.shutdownsteps b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.shutdownsteps
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/conf.d/fbsplash.shutdownsteps
@@ -0,0 +1 @@
+7
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local
index a8c2205..a436fe5 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local
@@ -2,6 +2,8 @@
#
# /etc/rc.local: Local multi-user startup script.
#
+. /etc/rc.conf
+. /etc/rc.d/functions
. /etc/profile
. ${MV_ROOT}/bin/install_functions.sh
@@ -22,11 +24,15 @@ function install_db {
#check network parms
+stat_busy "Checking network"
init_network
+stat_done
+
#check to see if mysql is running
+stat_busy "Checking Mysql"
ATTEMPT=0
-mysql_check && echo "Installing the initial database" &&install_db
+mysql_check && printhl " Installing the initial database" &&install_db
mythconverg_check
status=$?
while [ ! $status = 0 ]
@@ -44,24 +50,31 @@ do
fi
if [ $ATTEMPT = 20 ]
then
- echo "Could not start mysql or install mythconverg within 20 attempts"
- echo "Aborting install"
+ printhl " Could not start mysql or install mythconverg within 20 attempts"
+ printhl " Aborting install"
exit 20
fi
done
-
+stat_done
#save some cmdline options
+stat_busy "Parsing command line"
parse_cmdline_2_db
+bootsplash_setup
+stat_done
#search for remote
+stat_busy "Checking for remote"
init_remote
-splash_setup
+stat_done
+printhl "Finished"
+
echo $CMDLINE | grep -qi NoX
if [ $? = 0 ]
then
- echo "No auto X option found"
+ echo ""
+ printhl "No auto X option found"
# /usr/bin/chvt 2
else
/root/startx &