Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-08-30 05:41:14 +0000
committerAaron Griffin <aaron@archlinux.org>2006-08-30 05:41:14 +0000
commit9275011f0ec188df50e4a59e59a8019eed22e238 (patch)
treeb49a74df2831bcc3776b839b676b09ca7238d6ea
parentb5d0aefc680045c5684e5edbf7e9808357c4edcd (diff)
git-svn-id: http://phraktured.net/archiso@3 00a9fe69-e71b-0410-bb23-df0e5024db41
-rw-r--r--mkarchiso.conf2
-rw-r--r--mkinitcpio.conf50
2 files changed, 2 insertions, 50 deletions
diff --git a/mkarchiso.conf b/mkarchiso.conf
index e2f521d..dcbdd12 100644
--- a/mkarchiso.conf
+++ b/mkarchiso.conf
@@ -1,5 +1,5 @@
# vim: set ft=sh:
-
+#TODO this can all be removed in place of commandline params to mkarchiso
kernelpkg="kernel26"
packager_name="Archlinux User"
diff --git a/mkinitcpio.conf b/mkinitcpio.conf
index 5f19528..d9bcc88 100644
--- a/mkinitcpio.conf
+++ b/mkinitcpio.conf
@@ -1,54 +1,6 @@
# 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"
+# This file is for mkarchiso ONLY and is not to be edited by hand
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 archlive ide scsi sata usb fw filesystems"