X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=myfai-chboot-local;fp=myfai-chboot-local;h=8ab5a92117a568ec3bf259e333fc0c4b121952c8;hp=4fc6f06bd56183162800004ce3750ab867ab0cfc;hb=14f283f82afc48d6cec1bb7498ec34ac2b0da77c;hpb=bd3227e34e549257fee819cf6bd50fe202ca7996 diff --git a/myfai-chboot-local b/myfai-chboot-local index 4fc6f06..8ab5a92 100755 --- a/myfai-chboot-local +++ b/myfai-chboot-local @@ -7,6 +7,7 @@ set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR kgped16=false +bond=false fai_action=install fai_reboot_arg=,reboot while [[ $1 == -* ]]; do @@ -26,7 +27,11 @@ while [[ $1 == -* ]]; do shift ;; -k) - kgped16=true; + kgped16=true + shift + ;; + -b) + bond=true shift ;; esac @@ -113,6 +118,8 @@ default_k_args=$(fai-chboot -L '^default$' | \ # https://wiki.archlinux.org/index.php/Solid_state_drive#Resolving_NCQ_errors # currently on needed on d16 samsung 870 qvo, but better to have this # and not wait for more conditions where its needed. +#k_args=(FAI_ACTION=$fai_action libata.force=noncq ifname:bootnet0:08:60:6e:10:f0:fe ifname:bootnet1:08:60:6e:10:f0:98 bond=bond0:bootnet0,bootnet1:mode=balance-rr) +#k_args=(FAI_ACTION=$fai_action libata.force=noncq ifname:bootnet0:08:60:6e:10:f0:fe biosdevname=0 bootdev=bootnet0) k_args=(FAI_ACTION=$fai_action libata.force=noncq) if $kgped16; then k_args+=(console=tty0 console=ttyS0,115200) @@ -122,6 +129,14 @@ for arg in $default_k_args; do case $arg in # default root arg is /srv/fai/nfsroot root=*) k_args+=(root=$root_arg) ;; + # note: this works to only dhcp on one interface: ip=eth0:dhcp + ip=*) + if $bond; then + k_args+=("bond=bond0:eth0,eth1:mode=balance-rr ip=bond0:dhcp") + else + k_args+=($arg) + fi + ;; *) k_args+=($arg) ;; esac done