From dd7ce4b5fdf2c2396c4de34affd7491e87019309 Mon Sep 17 00:00:00 2001 From: WANG Chao Date: Thu, 13 Jun 2013 10:06:28 +0800 Subject: [PATCH] dracut-module-setup.sh: improve the approach to get a bridged interface list When directory is empty, echo * will output *, not empty string. That's not intended. Also it looks a little bit nicer now. Signed-off-by: WANG Chao Acked-by: Baoquan He --- dracut-module-setup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index 87d0a20..725eecf 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -100,6 +100,7 @@ kdump_get_perm_addr() { kdump_setup_bridge() { local _netdev=$1 + local _brif="" for _dev in `ls /sys/class/net/$_netdev/brif/`; do if kdump_is_bond "$_dev"; then kdump_setup_bond "$_dev" @@ -110,8 +111,9 @@ kdump_setup_bridge() { else echo -n " ifname=$_dev:$(kdump_get_mac_addr $_dev)" >> ${initdir}/etc/cmdline.d/41bridge.conf fi + _brif+="$_dev," done - echo " bridge=$_netdev:$(cd /sys/class/net/$_netdev/brif/; echo * | sed -e 's/ /,/g')" >> ${initdir}/etc/cmdline.d/41bridge.conf + echo " bridge=$_netdev:$(echo $_brif | sed -e 's/,$//')" >> ${initdir}/etc/cmdline.d/41bridge.conf } kdump_setup_bond() {