e-m-b-a/emba
1
0
Fork 0
mirror of https://github.com/e-m-b-a/emba.git synced 2026-10-11 22:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

tunctl -> ip tuntap

Browse Source
This commit is contained in:
Michael Messner
2026-10-09 17:37:47 +02:00
parent bd143b1229
commit d8d98fbdc2
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
helpers/helpers_emba_system_emulation.sh
+3 -3
View File
@@ -144,13 +144,13 @@ reset_network_emulation() {
print_output "Deleting TAP device ${TAPDEV_0}..." "no_log"
write_script_exec "echo -e \"Deleting TAP device ...\n\"" "${ARCHIVE_PATH}"/run.sh 0
fi
if [[ "${lEXECUTE}" -lt 2 ]] && [[ -f "${ARCHIVE_PATH}"/run.sh ]] && ! grep -q "tunctl -d ${TAPDEV_0}" "${ARCHIVE_PATH}"/run.sh >/dev/null; then
if [[ "${lEXECUTE}" -lt 2 ]] && [[ -f "${ARCHIVE_PATH}"/run.sh ]] && ! grep -q "ip tuntap del dev ${TAPDEV_0} mode tap" "${ARCHIVE_PATH}"/run.sh >/dev/null; then
lEXECUTE_tmp=1
else
lEXECUTE_tmp="${lEXECUTE}"
fi
if [[ -f "${ARCHIVE_PATH}"/run.sh ]] && ! grep -q "tunctl -d ${TAPDEV_0}" "${ARCHIVE_PATH}"/run.sh >/dev/null; then
write_script_exec "tunctl -d ${TAPDEV_0}" "${ARCHIVE_PATH}"/run.sh "${lEXECUTE_tmp}"
if [[ -f "${ARCHIVE_PATH}"/run.sh ]] && ! grep -q "ip tuntap del dev ${TAPDEV_0} mode tap" "${ARCHIVE_PATH}"/run.sh >/dev/null; then
write_script_exec "ip tuntap del dev ${TAPDEV_0} mode tap" "${ARCHIVE_PATH}"/run.sh "${lEXECUTE_tmp}"
fi
}
modules/L10_system_emulation.sh
+2 -3
View File
@@ -277,7 +277,7 @@ cleanup_tap() {
mapfile -t lTAP_CLEAN_ARR < <(ifconfig | grep tap | cut -d: -f1 || true)
for lTAP_TO_CLEAN in "${lTAP_CLEAN_ARR[@]}"; do
print_output "[*] Cleaning up TAP interface ${lTAP_TO_CLEAN}"
tunctl -d "${lTAP_TO_CLEAN}" || print_error "[-] Error in tap cleanup"
ip tuntap del dev ${lTAP_TO_CLEAN} mode tap
done
}
@@ -2132,8 +2132,7 @@ setup_network_emulation() {
export HOSTNETDEV_0="${TAPDEV_0}"
print_output "[*] Creating TAP device ${ORANGE}${TAPDEV_0}${NC} ..."
write_script_exec "echo -e \"Creating TAP device ${TAPDEV_0}\n\"" "${ARCHIVE_PATH}"/run.sh 0
write_script_exec "command -v tunctl > /dev/null || (echo \"Missing tunctl ... check your installation - install uml-utilities package\" && exit 1)" "${ARCHIVE_PATH}"/run.sh 0
write_script_exec "tunctl -t ${TAPDEV_0}" "${ARCHIVE_PATH}"/run.sh 1
write_script_exec "ip tuntap add dev ${TAPDEV_0} mode tap" "${ARCHIVE_PATH}"/run.sh 1
if [[ "${lVLAN_ID}" != "NONE" ]]; then
HOSTNETDEV_0="${TAPDEV_0}"."${lVLAN_ID}"
modules/S130_binary_map_builder.sh
+2 -2
View File
@@ -235,12 +235,12 @@ system_emulator_init_runner() {
ip route flush dev "${lTAP_INTERFACE}"
ip link set "${lTAP_INTERFACE}" down
ip link delete "${lTAP_INTERFACE}"
tunctl -d "${lTAP_INTERFACE}"
ip tuntap del dev "${lTAP_INTERFACE}" mode tap
else
sudo ip route flush dev "${lTAP_INTERFACE}"
sudo ip link set "${lTAP_INTERFACE}" down
sudo ip link delete "${lTAP_INTERFACE}"
sudo tunctl -d "${lTAP_INTERFACE}"
sudo ip tuntap del dev "${lTAP_INTERFACE}" mode tap
fi
fi