From 9494671269e613c88218658e7f3686014744fd08 Mon Sep 17 00:00:00 2001 From: Nathan Williams Date: Thu, 24 Jun 2010 10:15:34 -0400 Subject: [PATCH] Fix up the modification of the flimflam upstart script to handle changed command line arguments, and attempt to make it resilient in the face of future changes. TEST=Run script on fresh image; confirm that '-I eth_test' is present on the exec line of /etc/init/flimflam.conf Review URL: http://codereview.chromium.org/2842023 --- mod_for_test_scripts/100setupTestingInterface | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod_for_test_scripts/100setupTestingInterface b/mod_for_test_scripts/100setupTestingInterface index 65eca0b86e..9fc540913a 100755 --- a/mod_for_test_scripts/100setupTestingInterface +++ b/mod_for_test_scripts/100setupTestingInterface @@ -11,7 +11,7 @@ testif=eth_test # Prevent flimflam from taking control of the backchannel network device. ORIG_CONF=${ROOT_FS_DIR}/etc/init/flimflam.conf TEMP_CONF=${ORIG_CONF}.tmp -sed "s/flimflamd -W/flimflamd -I ${testif} -W/" ${ORIG_CONF} > ${TEMP_CONF} +sed "s,/usr/sbin/flimflamd,/usr/sbin/flimflamd -I ${testif}," ${ORIG_CONF} > ${TEMP_CONF} mv -f ${TEMP_CONF} ${ORIG_CONF} # Arrange to run dhclient on the backchannel device but without