@@ -242,17 +242,20 @@ copy_from_docker() {
242
242
local dstpath=$3
243
243
local timeout_cmd=" timeout --foreground ${TIMEOUT_MIN} m"
244
244
245
+ local touch_cmd=" sudo docker exec -i ${docker} touch ${filename} "
246
+ local cp_cmd=" sudo docker cp ${docker} :${filename} ${dstpath} "
247
+
245
248
if $NOOP ; then
246
- echo " ${timeout_cmd} sudo docker exec -i ${docker} touch ${filename }"
247
- echo " ${timeout_cmd} sudo docker cp ${docker} : ${filename} ${dstpath }"
249
+ echo " ${timeout_cmd} ${touch_cmd }"
250
+ echo " ${timeout_cmd} ${cp_cmd }"
248
251
else
249
- eval " ${timeout_cmd} sudo docker exec -i ${docker} touch ${filename }"
252
+ eval " ${timeout_cmd} ${touch_cmd }"
250
253
if [ $? -ne 0 ]; then
251
- echo " Command: $cmd timedout after ${TIMEOUT_MIN} minutes."
254
+ echo " Command: $touch_cmd timedout after ${TIMEOUT_MIN} minutes."
252
255
fi
253
- eval " ${timeout_cmd} sudo docker cp ${docker} : ${filename} ${dstpath }"
256
+ eval " ${timeout_cmd} ${cp_cmd }"
254
257
if [ $? -ne 0 ]; then
255
- echo " Command: $cmd timedout after ${TIMEOUT_MIN} minutes."
258
+ echo " Command: $cp_cmd timedout after ${TIMEOUT_MIN} minutes."
256
259
fi
257
260
fi
258
261
end_t=$( date +%s%3N)
@@ -1084,7 +1087,7 @@ main() {
1084
1087
save_cmd " show interface status -d all" " interface.status"
1085
1088
save_cmd " show interface transceiver presence" " interface.xcvrs.presence"
1086
1089
save_cmd " show interface transceiver eeprom --dom" " interface.xcvrs.eeprom"
1087
- save_cmd_all_ns " show ip interface" " ip.interface"
1090
+ save_cmd " show ip interface -d all " " ip.interface"
1088
1091
1089
1092
save_cmd " lldpctl" " lldpctl"
1090
1093
if [[ ( " $NUM_ASICS " > 1 ) ]]; then
0 commit comments