diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2009-01-05 14:58:18 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2009-01-05 14:58:18 -0500 |
| commit | 30866d8818e11dd8ad12cb1ff16e1db8bd8cf25b (patch) | |
| tree | 5a10e084a03efb2543719430fabb5ea9e0dff4db /snippets | |
| parent | 017a19446ac95942bb7b545d9c011915daa7eddc (diff) | |
| parent | bbeb9b497a11ed85880d6c751a2f968ab22c97fb (diff) | |
| download | cobbler-30866d8818e11dd8ad12cb1ff16e1db8bd8cf25b.tar.gz cobbler-30866d8818e11dd8ad12cb1ff16e1db8bd8cf25b.tar.xz cobbler-30866d8818e11dd8ad12cb1ff16e1db8bd8cf25b.zip | |
Merge branch 'master' into devel
Conflicts:
snippets/post_install_network_config
Diffstat (limited to 'snippets')
| -rw-r--r-- | snippets/post_install_network_config | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/snippets/post_install_network_config b/snippets/post_install_network_config index 6166a1d8..aa6897c3 100644 --- a/snippets/post_install_network_config +++ b/snippets/post_install_network_config @@ -34,7 +34,7 @@ #set $i = 0 ## setup bonding if we have to #if $numbondingdevs > 0 -if [ -x "/etc/modprobe.conf" ]; then +if [ -f "/etc/modprobe.conf" ]; then; echo "options bonding max_bonds=$numbondingdevs" >> /etc/modprobe.conf fi #end if @@ -78,7 +78,7 @@ mv /etc/sysconfig/network.cobbler /etc/sysconfig/network ## if this is a bonded interface, configure it in modprobe.conf #if $bonding.lower() == "master" ## Add required entry to modprobe.conf -if [ -x "/etc/modprobe.conf" ]; then +if [ -f "/etc/modprobe.conf" ]; then echo "alias $iname bonding" >> /etc/modprobe.conf.cobbler fi #end if @@ -88,7 +88,7 @@ fi IFNAME=\$(ifconfig -a | grep -i '$mac' | cut -d ' ' -f 1) ## Rename this interface in modprobe.conf ## FIXME: if both interfaces startwith eth this is wrong -if [ -x "/etc/modprobe.conf" ]; then +if [ -f "/etc/modprobe.conf" ]; then; grep \$IFNAME /etc/modprobe.conf | sed "s/\$IFNAME/$iname/" >> /etc/modprobe.conf.cobbler grep -v \$IFNAME /etc/modprobe.conf >> /etc/modprobe.conf.new rm -f /etc/modprobe.conf @@ -221,7 +221,7 @@ echo "$network via $router" >> $routesfile rm -f /etc/sysconfig/network-scripts/ifcfg-* mv /etc/sysconfig/network-scripts/cobbler/* /etc/sysconfig/network-scripts/ rm -r /etc/sysconfig/network-scripts/cobbler -if [ -x "/etc/modprobe.conf" ]; then +if [ -f "/etc/modprobe.conf" ]; then; cat /etc/modprobe.conf.cobbler >> /etc/modprobe.conf rm -f /etc/modprobe.conf.cobbler fi |