Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-dev.git

9 files changed, 168 insertions, 6 deletions

diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/hardsub.cfg b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/hardsub.cfg
index 7631d0a..74b8e84 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/hardsub.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/hardsub.cfg
@@ -14,7 +14,7 @@ MENU TITLE LinHES: The Linux Home Entertainment System
 label atomic
 MENU LABEL LinHES on Atomic Ant!
 kernel vmlinuz
-append initrd=larch.img vga=791 quiet splash disablemodules=agpart,intel_agp
+append initrd=larch.img  vga=792 quiet splash=silent,theme:darch console=tty1 disablemodules=agpart,intel_agp
 
 #label linux-i810
 #MENU LABEL with Intel i810 driver (DRI disabled)
diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg
index 62fe397..c928973 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg
@@ -15,7 +15,7 @@ MENU TITLE LinHES: The Linux Home Entertainment System
 label linux
 MENU LABEL LinHES with Splashy (default).
 kernel vmlinuz
-append initrd=larch.img vga=791 quiet splash
+append initrd=larch.img vga=792 quiet splash=silent,theme:darch console=tty1
 
 label linux-nosplash
 MENU LABEL LinHES without splash screen.
diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/mkinitcpio.conf b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/mkinitcpio.conf
new file mode 100644
index 0000000..7279f45
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/mkinitcpio.conf
@@ -0,0 +1,54 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES="piix ide_disk reiserfs"
+MODULES=""
+
+# BINARIES
+# This setting includes, into the CPIO image, and additional
+# binaries a given user may wish.  This is run first, so may
+# be used to override the actual binaries used in a given hook.
+# (Existing files are NOT overwritten is already added)
+# BINARIES are dependancy parsed, so you may safely ignore libraries
+#BINARIES=""
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in anyway.  This is useful for config files.
+# Some users may wish to include modprobe.conf for custom module options,
+# like so:
+#    FILES="/etc/modprobe.conf"
+FILES=""
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'modload' may be used in place of 'udev', but is not recommended
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+#    This setup specifies all modules in the MODULES setting above.
+#    No raid, lvm, or encrypted root is needed.
+#    HOOKS="base"
+#
+#    This setup will autodetect all modules for your system and should
+#    work as a sane default
+#    HOOKS="base udev autodetect ide scsi sata filesystems"
+#
+#    This setup will generate a 'full' image which supports most systems.
+#    No autodetection is done.
+#    HOOKS="base udev ide scsi sata usb filesystems"
+#
+#    This setup assembles an ide raid array with an encrypted root FS.
+#    Note: See 'mkinitcpio -H raid' for more information on raid devices.
+#    HOOKS="base udev ide filesystems raid encrypt"
+#
+#    This setup loads an LVM volume group on a usb device.
+#    HOOKS="base udev usb filesystems lvm"
+HOOKS="base udev pata scsi sata usb larch1 larch2_aufs larch3 fbsplash"
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/hardsub.cfg b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/hardsub.cfg
index 7631d0a..74b8e84 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/hardsub.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/hardsub.cfg
@@ -14,7 +14,7 @@ MENU TITLE LinHES: The Linux Home Entertainment System
 label atomic
 MENU LABEL LinHES on Atomic Ant!
 kernel vmlinuz
-append initrd=larch.img vga=791 quiet splash disablemodules=agpart,intel_agp
+append initrd=larch.img  vga=792 quiet splash=silent,theme:darch console=tty1 disablemodules=agpart,intel_agp
 
 #label linux-i810
 #MENU LABEL with Intel i810 driver (DRI disabled)
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg
index 62fe397..c928973 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg
@@ -15,7 +15,7 @@ MENU TITLE LinHES: The Linux Home Entertainment System
 label linux
 MENU LABEL LinHES with Splashy (default).
 kernel vmlinuz
-append initrd=larch.img vga=791 quiet splash
+append initrd=larch.img vga=792 quiet splash=silent,theme:darch console=tty1
 
 label linux-nosplash
 MENU LABEL LinHES without splash screen.
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/mkinitcpio.conf b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/mkinitcpio.conf
new file mode 100644
index 0000000..7279f45
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/mkinitcpio.conf
@@ -0,0 +1,54 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES="piix ide_disk reiserfs"
+MODULES=""
+
+# BINARIES
+# This setting includes, into the CPIO image, and additional
+# binaries a given user may wish.  This is run first, so may
+# be used to override the actual binaries used in a given hook.
+# (Existing files are NOT overwritten is already added)
+# BINARIES are dependancy parsed, so you may safely ignore libraries
+#BINARIES=""
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in anyway.  This is useful for config files.
+# Some users may wish to include modprobe.conf for custom module options,
+# like so:
+#    FILES="/etc/modprobe.conf"
+FILES=""
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'modload' may be used in place of 'udev', but is not recommended
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+#    This setup specifies all modules in the MODULES setting above.
+#    No raid, lvm, or encrypted root is needed.
+#    HOOKS="base"
+#
+#    This setup will autodetect all modules for your system and should
+#    work as a sane default
+#    HOOKS="base udev autodetect ide scsi sata filesystems"
+#
+#    This setup will generate a 'full' image which supports most systems.
+#    No autodetection is done.
+#    HOOKS="base udev ide scsi sata usb filesystems"
+#
+#    This setup assembles an ide raid array with an encrypted root FS.
+#    Note: See 'mkinitcpio -H raid' for more information on raid devices.
+#    HOOKS="base udev ide filesystems raid encrypt"
+#
+#    This setup loads an LVM volume group on a usb device.
+#    HOOKS="base udev usb filesystems lvm"
+HOOKS="base udev pata scsi sata usb larch1 larch2_aufs larch3 fbsplash"
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/hardsub.cfg b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/hardsub.cfg
index 7631d0a..74b8e84 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/hardsub.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/hardsub.cfg
@@ -14,7 +14,7 @@ MENU TITLE LinHES: The Linux Home Entertainment System
 label atomic
 MENU LABEL LinHES on Atomic Ant!
 kernel vmlinuz
-append initrd=larch.img vga=791 quiet splash disablemodules=agpart,intel_agp
+append initrd=larch.img  vga=792 quiet splash=silent,theme:darch console=tty1 disablemodules=agpart,intel_agp
 
 #label linux-i810
 #MENU LABEL with Intel i810 driver (DRI disabled)
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 62fe397..c928973 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 with Splashy (default).
 kernel vmlinuz
-append initrd=larch.img vga=791 quiet splash
+append initrd=larch.img vga=792 quiet splash=silent,theme:darch console=tty1
 
 label linux-nosplash
 MENU LABEL LinHES without splash screen.
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf b/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf
new file mode 100644
index 0000000..7279f45
--- /dev/null
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf
@@ -0,0 +1,54 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES="piix ide_disk reiserfs"
+MODULES=""
+
+# BINARIES
+# This setting includes, into the CPIO image, and additional
+# binaries a given user may wish.  This is run first, so may
+# be used to override the actual binaries used in a given hook.
+# (Existing files are NOT overwritten is already added)
+# BINARIES are dependancy parsed, so you may safely ignore libraries
+#BINARIES=""
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in anyway.  This is useful for config files.
+# Some users may wish to include modprobe.conf for custom module options,
+# like so:
+#    FILES="/etc/modprobe.conf"
+FILES=""
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'modload' may be used in place of 'udev', but is not recommended
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+#    This setup specifies all modules in the MODULES setting above.
+#    No raid, lvm, or encrypted root is needed.
+#    HOOKS="base"
+#
+#    This setup will autodetect all modules for your system and should
+#    work as a sane default
+#    HOOKS="base udev autodetect ide scsi sata filesystems"
+#
+#    This setup will generate a 'full' image which supports most systems.
+#    No autodetection is done.
+#    HOOKS="base udev ide scsi sata usb filesystems"
+#
+#    This setup assembles an ide raid array with an encrypted root FS.
+#    Note: See 'mkinitcpio -H raid' for more information on raid devices.
+#    HOOKS="base udev ide filesystems raid encrypt"
+#
+#    This setup loads an LVM volume group on a usb device.
+#    HOOKS="base udev usb filesystems lvm"
+HOOKS="base udev pata scsi sata usb larch1 larch2_aufs larch3 fbsplash"