From 4920ba650d575d32bd1e7c5f322c9a7897ede3b1 Mon Sep 17 00:00:00 2001 From: immarvin Date: Thu, 19 Dec 2013 19:11:31 -0800 Subject: [PATCH] grep in busybox do not support long optipn string, use short instead --- xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite index 9f735c49a..e403514ad 100755 --- a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite +++ b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite @@ -576,7 +576,7 @@ ResolveLinks #cp -r -a ${DEFAULT}/* /.snapshot/tmpfs/ # foo # If the resolv.conf is not setup in rootimg, copy the dhcp generated one into rootimg -if grep --quiet --no-messages "Dummy resolv.conf" "$MNTDIR/etc/resolv.conf"; then +if grep -q -s "Dummy resolv.conf" "$MNTDIR/etc/resolv.conf"; then /bin/cat /etc/resolv.conf > $MNTDIR/etc/resolv.conf fi