[hooks/archiso_pxe_nbd] Refactor, remove sed usage.
* ipconfig cmd writes a file in /tmp that is ready for direct evaluation. We can use this instead of parsing the output, to do this some variable renames are needed. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
parent
7ab83b8571
commit
da813e5b9d
@ -1,8 +1,12 @@
|
||||
# vim: set ft=sh:
|
||||
run_hook () {
|
||||
local line i net_mac bootif_mac bootif_dev address netmask gateway dns0 dns1 rootserver rootpath filename
|
||||
|
||||
: > /ip_opts
|
||||
local line i net_mac bootif_mac bootif_dev
|
||||
# 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 [ -n "${ip}" ]; then
|
||||
if [ -n "${BOOTIF}" ]; then
|
||||
@ -20,45 +24,11 @@ run_hook () {
|
||||
fi
|
||||
|
||||
# setup network and save some values
|
||||
ipconfig "ip=${ip}" | while read line; do
|
||||
# echo ":: ${line}"
|
||||
if [ "${line#"IP-Config:"}" != "${line}" ]; then
|
||||
continue
|
||||
fi
|
||||
line="$(echo ${line} | sed -e 's/ :/:/g;s/: /=/g')"
|
||||
for i in ${line}; do
|
||||
case "${i}" in
|
||||
address=*)
|
||||
echo "${i}" >> /ip_opts
|
||||
;;
|
||||
netmask=*)
|
||||
echo "${i}" >> /ip_opts
|
||||
;;
|
||||
gateway=*)
|
||||
echo "${i}" >> /ip_opts
|
||||
;;
|
||||
dns0=*)
|
||||
echo "${i}" >> /ip_opts
|
||||
;;
|
||||
dns1=*)
|
||||
echo "${i}" >> /ip_opts
|
||||
;;
|
||||
rootserver=*)
|
||||
echo "${i}" >> /ip_opts
|
||||
;;
|
||||
rootpath=*)
|
||||
echo "${i}" >> /ip_opts
|
||||
;;
|
||||
esac
|
||||
done
|
||||
done
|
||||
ipconfig "ip=${ip}"
|
||||
|
||||
. /ip_opts
|
||||
. /tmp/net-*.conf
|
||||
|
||||
echo "IP-Config: ${address}/${netmask}"
|
||||
echo "IP-Config: gw: ${gateway} dns0: ${dns0} dns1: ${dns1}"
|
||||
|
||||
nbdserver=${rootserver}
|
||||
nbdserver=${ROOTSERVER}
|
||||
|
||||
[[ -z "${archiso_nbd_name}" ]] && archiso_nbd_name="archiso"
|
||||
|
||||
|
@ -12,6 +12,8 @@ build ()
|
||||
FILES=""
|
||||
SCRIPT="archiso_pxe_nbd"
|
||||
|
||||
add_dir /tmp
|
||||
|
||||
add_binary "/usr/sbin/nbd-client" "/bin/nbd-client"
|
||||
add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user