Add other setup-related items for EC2 interface

setup/so-setup

@@ -100,6 +100,8 @@ got_root
 
 detect_os
 
+is_ec2
+
 if [ "$OS" == ubuntu ]; then
 	update-alternatives --set newt-palette /etc/newt/palette.original >> $setup_log 2>&1
 fi
@@ -225,7 +227,11 @@ fi
 
 # Start user prompts
 if [[ $is_helix || $is_sensor ]]; then
-	whiptail_bond_nics
+	if [ $is_ec2 -eq 1 ]; then
+             whiptail_ec2_nic
+        else
+             whiptail_bond_nics
+        fi
 	calculate_useable_cores
 fi
 
@@ -373,9 +379,12 @@ fi
 	update_packages >> $setup_log 2>&1
 
 	if [[ $is_sensor || $is_helix ]]; then
-		set_progress_str 3 'Creating bond interface'
-		create_sensor_bond >> $setup_log 2>&1
-		
+		set_progress_str 3 'Creating bond/sniffing interface'
+		if [ $is_ec2 -eq 1 ]; then
+                        create_ec2_sniffing >> $setup_log 2>&1
+                else
+                        create_sensor_bond >> $setup_log 2>&1
+                fi
 		set_progress_str 4 'Generating sensor pillar'
 		sensor_pillar >> $setup_log 2>&1
 	fi