From b317b01465d81b2adadd5f8d964e59622a6a7a32 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 2 May 2012 21:41:01 -0400 Subject: remove 'net' hooks. these belong to mkinitcpio-nfs-utils Signed-off-by: Dave Reisner --- hooks/net | 87 ------------------------------------------------- install/net | 106 ------------------------------------------------------------ 2 files changed, 193 deletions(-) delete mode 100644 hooks/net delete mode 100644 install/net diff --git a/hooks/net b/hooks/net deleted file mode 100644 index ea19230..0000000 --- a/hooks/net +++ /dev/null @@ -1,87 +0,0 @@ -# vim: set ft=sh: -run_hook () -{ - local line i net_mac bootif_mac bootif_dev defaultrootpath defaultserver - # These variables will be parsed from /tmp/net-*.conf generated by ipconfig - local DEVICE - local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1 - local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH - local filename - # /tmp/net-*.conf - - if [ -z "${ip}" -a -n "${nfsaddrs}" ]; then - ip="${nfsaddrs}" - fi - - if [ -n "${ip}" ]; then - if [ -n "${BOOTIF}" ]; then - bootif_mac=${BOOTIF#01-} - bootif_mac=${bootif_mac//-/:} - for i in /sys/class/net/*/address; do - read net_mac < ${i} - if [ "${bootif_mac}" == "${net_mac}" ]; then - bootif_dev=${i#/sys/class/net/} - bootif_dev=${bootif_dev%/address} - break - fi - done - ip="${ip}::${bootif_dev}" - fi - - # setup network and save some values - ipconfig "ip=${ip}" - - . /tmp/net-*.conf - - # calculate nfs_server, nfs_path and nfs_option for later nfs mount - if [ "${root}" = "/dev/nfs" -o "${nfsroot}" != "" ]; then - # parse ROOTPATH if defined by dhcp server - if [ -n "${ROOTPATH}" ]; then - line="${ROOTPATH}" - nfs_server="${line%%:*}" - [ "${nfs_server}" = "${line}" ] && nfs_server="${ROOTSERVER}" - defaultserver="${nfs_server}" - line="${line#*:}" - nfs_path="${line}" - defaultrootpath="${nfs_path}" - else - # define a default ROOTPATH - if [ "${ROOTPATH}" = "" ]; then - defaultrootpath="/tftpboot/${IPV4ADDR}" - fi - fi - - # parse nfsroot if present (overrides ROOTPATH) - if [ -n "${nfsroot}" ]; then - line="${nfsroot}" - nfs_server="${line%%:*}" - [ -z "${nfs_server}" ] && nfs_server="${defaultserver}" - line="${line#*:}" - nfs_path="${line%%,*}" - line="${line#"${nfs_path}"}" - [ -z "${nfs_path}" ] && nfs_path="${defaultrootpath}" - nfs_option="${line#","}" - fi - - # ensure root and filesystem type are set proper for nfs boot - root="/dev/nfs" - rootfstype="nfs" - - echo "NFS-Mount: ${nfs_server}:${nfs_path}" - - # set mount handler for NFS - mount_handler="nfs_mount_handler" - fi - fi -} - -nfs_mount_handler() { - if [ -z "$nfs_server" -o -z "$nfs_path" ]; then - err "Unable to mount root filesystem over NFS: wrong parameters." - echo "You are being dropped to a recovery shell" - echo " Type 'exit' to try and continue booting" - launch_interactive_shell - msg "Trying to continue (this will most likely fail) ..." - fi - nfsmount ${nfs_option:+-o ${nfs_option}} "${nfs_server}:${nfs_path}" "$1" -} diff --git a/install/net b/install/net deleted file mode 100644 index 88d0c97..0000000 --- a/install/net +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash - -build() { - MODULES="nfs $(checked_modules "/drivers/net/") " - SCRIPT="net" - - add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig" - add_binary "/lib/initcpio/nfsmount" "/bin/nfsmount" -} - -help() { - cat <:::::: -nfsaddrs= is an alias to ip= and can be used too. - - IP address of the client. If empty, the address will - either be determined by RARP/BOOTP/DHCP. What protocol - is used de- pends on the parameter. If this - parameter is not empty, autoconf will be used. - - IP address of the NFS server. If RARP is used to - determine the client address and this parameter is NOT - empty only replies from the specified server are - accepted. To use different RARP and NFS server, - specify your RARP server here (or leave it blank), and - specify your NFS server in the 'nfsroot' parameter - (see above). If this entry is blank the address of the - server is used which answered the RARP/BOOTP/DHCP - request. - - IP address of a gateway if the server is on a different - subnet. If this entry is empty no gateway is used and the - server is assumed to be on the local network, unless a - value has been received by BOOTP/DHCP. - - Netmask for local network interface. If this is empty, - the netmask is derived from the client IP address assuming - classful addressing, unless overridden in BOOTP/DHCP reply. - - Name of the client. If empty, the client IP address is - used in ASCII notation, or the value received by - BOOTP/DHCP. - - Name of network device to use. If this is empty, all - devices are used for RARP/BOOTP/DHCP requests, and the - first one we receive a reply on is configured. If you - have only one device, you can safely leave this blank. - - Method to use for autoconfiguration. If this is either - 'rarp', 'bootp', or 'dhcp' the specified protocol is - used. If the value is 'both', 'all' or empty, all - protocols are used. 'off', 'static' or 'none' means - no autoconfiguration. -Examples: -ip=127.0.0.1:::::lo:none --> 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=[:][,] - -If the 'nfsroot' parameter is NOT given on the command line, the default -"/tftpboot/%s" will be used. - - 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. - - 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. - - 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: -- cgit v1.2.3-24-g4f1b