This introduces no logical code changes -- this is purely a syntactical
cleanup and standardization across the build hooks. All hooks get the
same treatment, adhering to the following style:
build() {
instructions
}
help() {
cat <
---
Massive patch, but there's nothing horribly exciting going on.
install/btrfs | 15 ++--
install/dsdt | 21 ++----
install/filesystems | 2 +-
install/fw | 29 +++-----
install/ide | 30 +++-----
install/keymap | 2 +-
install/memdisk | 19 +++---
install/net | 195 +++++++++++++++++++++++++--------------------------
install/pata | 2 +-
install/pcmcia | 28 ++++----
install/resume | 19 ++---
install/sata | 2 +-
install/scsi | 2 +-
install/sleep | 27 +++----
install/udev | 33 ++++-----
install/usb | 30 ++++-----
install/usbinput | 30 +++-----
17 files changed, 220 insertions(+), 266 deletions(-)
diff --git a/install/btrfs b/install/btrfs
index c156bb0..60e6f5c 100644
--- a/install/btrfs
+++ b/install/btrfs
@@ -1,16 +1,15 @@
-# vim:set ft=sh:
+#!/bin/bash
-build()
-{
+build() {
MODULES="$(all_modules btrfs)"
BINARIES="/sbin/btrfs"
SCRIPT="btrfs"
}
-help ()
-{
-cat <http://syslinux.zytor.com/wiki/index.php/MEMDISK).
+help() {
+ cat <http://syslinux.zytor.com/wiki/index.php/MEMDISK).
- It requires memdiskfind from syslinux 4.00 or newer.
+It requires memdiskfind from syslinux 4.00 or newer.
HELPEOF
}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/install/net b/install/net
index 2c816ba..88d0c97 100644
--- a/install/net
+++ b/install/net
@@ -1,109 +1,106 @@
-# vim: set ft=sh:
+#!/bin/bash
-build()
-{
+build() {
MODULES="nfs $(checked_modules "/drivers/net/") "
-
- BINARIES=""
- FILES=""
SCRIPT="net"
add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig"
add_binary "/lib/initcpio/nfsmount" "/bin/nfsmount"
}
-help ()
-{
-cat< Enable the loopback interface.
- ip=192.168.1.1:::::eth2:none --> Enable static eth2 interface.
- ip=:::::eth0:dhcp --> Enable dhcp protcol for eth0 configuration.
-
- nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
-
- If the 'nfsroot' parameter is NOT given on the command line, the default
- "/tftpboot/%s" will be used.
-
- <server-ip> Specifies the IP address of the NFS server. If this field
- is not given, the default address as determined by the
- 'ip' variable (see below) is used. One use of this
- parameter is for example to allow using different servers
- for RARP and NFS. Usually you can leave this blank.
-
- <root-dir> Name of the directory on the server to mount as root. If
- there is a "%s" token in the string, the token will be
- replaced by the ASCII-representation of the client's IP
- address.
-
- <nfs-options> Standard NFS options. All options are separated by commas.
- If the options field is not given, the following defaults
- will be used:
- port = as given by server portmap daemon
- rsize = 1024
- wsize = 1024
- timeo = 7
- retrans = 3
- acregmin = 3
- acregmax = 60
- acdirmin = 30
- acdirmax = 60
- flags = hard, nointr, noposix, cto, ac
-
- root=/dev/nfs
-
- If you don't use nfsroot= parameter you need to set root=/dev/nfs
- to boot from a nfs root by autoconfiguration.
+help() {
+ cat < Enable the loopback interface.
+ip=192.168.1.1:::::eth2:none --> Enable static eth2 interface.
+ip=:::::eth0:dhcp --> Enable dhcp protcol for eth0 configuration.
+
+nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
+
+If the 'nfsroot' parameter is NOT given on the command line, the default
+"/tftpboot/%s" will be used.
+
+<server-ip> Specifies the IP address of the NFS server. If this field
+ is not given, the default address as determined by the
+ 'ip' variable (see below) is used. One use of this
+ parameter is for example to allow using different servers
+ for RARP and NFS. Usually you can leave this blank.
+
+<root-dir> Name of the directory on the server to mount as root. If
+ there is a "%s" token in the string, the token will be
+ replaced by the ASCII-representation of the client's IP
+ address.
+
+<nfs-options> Standard NFS options. All options are separated by commas.
+ If the options field is not given, the following defaults
+ will be used:
+ port = as given by server portmap daemon
+ rsize = 1024
+ wsize = 1024
+ timeo = 7
+ retrans = 3
+ acregmin = 3
+ acregmax = 60
+ acdirmin = 30
+ acdirmax = 60
+ flags = hard, nointr, noposix, cto, ac
+
+root=/dev/nfs
+
+If you don't use nfsroot= parameter you need to set root=/dev/nfs
+to boot from a nfs root by autoconfiguration.
HELPEOF
}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/install/pata b/install/pata
index 75a75c1..c51356e 100644
--- a/install/pata
+++ b/install/pata
@@ -9,7 +9,7 @@ build() {
}
help() {
- cat<