mirror of
https://github.com/CyberMind-FR/secubox-deb.git
synced 2026-08-17 07:23:59 +00:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
818d8a2206 | ||
|
|
557a3bb6cd |
@@ -284,9 +284,14 @@ gadget_start() {
|
|||||||
log "Activation sur UDC: ${udc}"
|
log "Activation sur UDC: ${udc}"
|
||||||
echo "$udc" > UDC
|
echo "$udc" > UDC
|
||||||
|
|
||||||
# Attendre que l'interface usb1 (ECM) apparaisse
|
# Attendre que la deuxième interface réseau du gadget composé
|
||||||
# Note: Le gadget composite crée usb0 (RNDIS/Windows) et usb1 (ECM/Linux-Mac)
|
# apparaisse côté kernel. Le composé crée rndis.usb0 puis ecm.usb0
|
||||||
# On configure usb1 car les hôtes Linux utilisent le driver cdc_ether (ECM)
|
# (dans cet ordre, cf. liens configfs ci-dessus) — le kernel les
|
||||||
|
# enregistre comme /sys/class/net/usb0 et /sys/class/net/usb1.
|
||||||
|
# Côté hôte, RNDIS et ECM partagent le même host_addr donc l'ARP
|
||||||
|
# remonte sur n'importe laquelle des deux interfaces UP du host;
|
||||||
|
# binder /usb1 ici suffit pour rendre 10.55.0.2 joignable depuis
|
||||||
|
# 10.55.0.1, peu importe le canal physique sélectionné par l'hôte.
|
||||||
local retry=0
|
local retry=0
|
||||||
while [[ ! -d /sys/class/net/usb1 ]] && [[ $retry -lt 10 ]]; do
|
while [[ ! -d /sys/class/net/usb1 ]] && [[ $retry -lt 10 ]]; do
|
||||||
sleep 0.5
|
sleep 0.5
|
||||||
@@ -294,9 +299,9 @@ gadget_start() {
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [[ -d /sys/class/net/usb1 ]]; then
|
if [[ -d /sys/class/net/usb1 ]]; then
|
||||||
log "Interface usb1 (ECM) créée"
|
log "Interface usb1 (deuxième fonction réseau du gadget) créée"
|
||||||
|
|
||||||
# Configurer l'IP sur usb1 uniquement (évite le routage asymétrique)
|
# Configurer l'IP sur usb1 uniquement (évite le routage asymétrique).
|
||||||
ip addr flush dev usb1 2>/dev/null || true
|
ip addr flush dev usb1 2>/dev/null || true
|
||||||
ip addr add "${OTG_NETWORK_DEV}/30" dev usb1
|
ip addr add "${OTG_NETWORK_DEV}/30" dev usb1
|
||||||
ip link set usb1 up
|
ip link set usb1 up
|
||||||
|
|||||||
@@ -704,15 +704,12 @@ ln -sf /etc/systemd/system/secubox-serial-console.service \
|
|||||||
# NOTE: fb-dashboard is DEPRECATED - use fallback-display instead
|
# NOTE: fb-dashboard is DEPRECATED - use fallback-display instead
|
||||||
# The old dashboard is kept for reference but NOT enabled by default
|
# The old dashboard is kept for reference but NOT enabled by default
|
||||||
|
|
||||||
# Network config for usb0
|
# IP binding for the gadget's usb1 interface is handled by
|
||||||
mkdir -p "$ROOT_MNT/etc/network/interfaces.d"
|
# /usr/local/sbin/secubox-otg-gadget.sh (the same script that composes
|
||||||
cat > "$ROOT_MNT/etc/network/interfaces.d/usb0" << 'EOF'
|
# the configfs gadget). The legacy /etc/network/interfaces.d/usb0
|
||||||
allow-hotplug usb0
|
# stanza was removed (closes #139) — it required `ifupdown` which the
|
||||||
iface usb0 inet static
|
# image never installed, so it never did anything except confuse
|
||||||
address 10.55.0.2
|
# diagnostics.
|
||||||
netmask 255.255.255.252
|
|
||||||
gateway 10.55.0.1
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# USB network script (handles both usb0 and usb1 - ECM may create either)
|
# USB network script (handles both usb0 and usb1 - ECM may create either)
|
||||||
mkdir -p "$ROOT_MNT/usr/local/bin"
|
mkdir -p "$ROOT_MNT/usr/local/bin"
|
||||||
@@ -787,8 +784,9 @@ if ! id secubox &>/dev/null; then
|
|||||||
echo "secubox:secubox2026" | chpasswd
|
echo "secubox:secubox2026" | chpasswd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Add to groups
|
# Add to groups. `sudo` lets the kiosk user manually recover networking
|
||||||
usermod -aG video,input,gpio,i2c,spi,audio secubox 2>/dev/null || true
|
# from the ACM serial console (e.g. when /dev/ttyACM0 is the only path in).
|
||||||
|
usermod -aG sudo,video,input,gpio,i2c,spi,audio secubox 2>/dev/null || true
|
||||||
|
|
||||||
# Enable lightdm and nginx
|
# Enable lightdm and nginx
|
||||||
systemctl enable lightdm 2>/dev/null || true
|
systemctl enable lightdm 2>/dev/null || true
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
allow-hotplug usb0
|
|
||||||
iface usb0 inet static
|
|
||||||
address 10.55.0.2
|
|
||||||
netmask 255.255.255.252
|
|
||||||
gateway 10.55.0.1
|
|
||||||
Reference in New Issue
Block a user