From d9cc97589873b0b2703b0d5b335ac1922f91e8d0 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 28 Aug 2010 14:24:16 -0700 Subject: profiles changes for LinHES 7. --- .../larch/profiles/i686-testing-local/addedpacks | 21 ++++----- .../larch/profiles/i686-testing-local/cache_packs | 2 +- .../profiles/i686-testing-local/mkinitcpio.conf | 3 +- .../i686-testing-local/mkinitcpio.conf.prel7 | 54 ++++++++++++++++++++++ 4 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf.prel7 diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks index 50ab297..d4da97c 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks @@ -7,7 +7,8 @@ syslinux # You need a kernel. #kernel26 is now in 'base' -aufs +aufs2 +kernel26-headers # To eject a cd eject @@ -64,7 +65,7 @@ xf86-video-glint xf86-video-i128 xf86-video-i740 #xf86-video-i810 -xf86-video-imstt +#xf86-video-imstt xf86-video-intel xf86-video-mga xf86-video-neomagic @@ -133,6 +134,7 @@ feh #Other dbus hal +hal-info fftw2 libcdaudio iptables @@ -153,21 +155,16 @@ avahi #Wireless b43-fwcutter -ipw2100-fw -ipw2200-fw +#ipw2100-fw +#ipw2200-fw #ipw3945 #ipw3945-ucode #ipw3945d -#iwlwifi-3945-ucode -iwlwifi-4965-ucode madwifi madwifi-utils ndiswrapper ndiswrapper-utils netcfg -rt2500 -rt2x00-rt61-fw -rt2x00-rt71w-fw tiacx tiacx-firmware wireless_tools @@ -198,7 +195,7 @@ acpid fbsplash linhes-splash nvram-wakup -tatir +#tatir pvr150-firmware wol mjpegtools @@ -223,4 +220,6 @@ mplayer-wrapper #removecommercials #Modules for Atheros base NICs -atl1e +#atl1e + +linux-firmware diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs index 72634dd..747ab46 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs @@ -48,7 +48,7 @@ mozilla-common nspr nss orbit2 -policykit +polkit pyorbit pyrex startup-notification diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf b/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf index 7279f45..27fe40f 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf +++ b/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf @@ -51,4 +51,5 @@ FILES="" # # 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" +#HOOKS="base udev pata scsi sata usb larch1 larch2_aufs larch3 fbsplash" +HOOKS="base udev pata scsi sata usb larch1 larch2_aufs larch3" diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf.prel7 b/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf.prel7 new file mode 100644 index 0000000..7279f45 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-local/mkinitcpio.conf.prel7 @@ -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 ' 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" -- cgit v0.12