fixed issues: ttyd, ap, pi-gen

This commit is contained in:
Konstantin Krastev
2024-07-22 18:00:13 +03:00
parent f653803032
commit 1a5fe4a0c5
5 changed files with 9 additions and 3 deletions

View File

@@ -11,4 +11,5 @@ FIRST_USER_NAME="dt"
FIRST_USER_PASS="proxmark3" FIRST_USER_PASS="proxmark3"
ENABLE_SSH=1 ENABLE_SSH=1
WPA_COUNTRY="US" WPA_COUNTRY="US"
DISABLE_FIRST_BOOT_USER_RENAME=1
STAGE_LIST="stage0 stage1 stage2 stageDTPM3" STAGE_LIST="stage0 stage1 stage2 stageDTPM3"

View File

@@ -11,4 +11,5 @@ FIRST_USER_NAME="dt"
FIRST_USER_PASS="proxmark3" FIRST_USER_PASS="proxmark3"
ENABLE_SSH=1 ENABLE_SSH=1
WPA_COUNTRY="US" WPA_COUNTRY="US"
DISABLE_FIRST_BOOT_USER_RENAME=1
STAGE_LIST="stage0 stage1 stage2 stageDTPM3" STAGE_LIST="stage0 stage1 stage2 stageDTPM3"

View File

@@ -12,6 +12,7 @@ libpython3-dev
libssl-dev libssl-dev
hostapd hostapd
dnsmasq dnsmasq
dhcpcd
lighttpd lighttpd
iptables-persistent iptables-persistent
vnstat vnstat

View File

@@ -43,8 +43,10 @@ cp installers/configport.sh /etc/raspap/lighttpd
chown -c root:www-data /etc/raspap/lighttpd/*.sh chown -c root:www-data /etc/raspap/lighttpd/*.sh
mv installers/raspapd.service /lib/systemd/system mv installers/raspapd.service /lib/systemd/system
cp installers/dhcpcd.service /lib/systemd/system
systemctl daemon-reload || true systemctl daemon-reload || true
systemctl enable raspapd.service systemctl enable raspapd.service
systemctl enable dhcpcd.service
cp /etc/hostapd/hostapd.conf ~/hostapd.conf.old || true cp /etc/hostapd/hostapd.conf ~/hostapd.conf.old || true
cp config/default_hostapd /etc/default/hostapd || true cp config/default_hostapd /etc/default/hostapd || true

View File

@@ -16,6 +16,7 @@ esac
cp ttyd.${model} /usr/local/bin/ttyd cp ttyd.${model} /usr/local/bin/ttyd
chown root:root /usr/local/bin/ttyd chown root:root /usr/local/bin/ttyd
chmod a+x /usr/local/bin/ttyd chmod a+x /usr/local/bin/ttyd
USER_UID=$(id -u dt)
cat > /etc/systemd/system/ttyd-bash.service << EOF cat > /etc/systemd/system/ttyd-bash.service << EOF
[Unit] [Unit]
@@ -28,7 +29,7 @@ WantedBy=multi-user.target
[Service] [Service]
User=dt User=dt
WorkingDirectory=/home/dt WorkingDirectory=/home/dt
ExecStart=/usr/local/bin/ttyd -p 8000 -u dt -m 1 -c dt:proxmark3 /usr/bin/bash ExecStart=/usr/local/bin/ttyd -p 8000 -W -u $USER_UID -m 1 -c dt:proxmark3 /usr/bin/bash
Restart=always Restart=always
Type=simple Type=simple
RestartSec=1 RestartSec=1
@@ -47,7 +48,7 @@ WantedBy=multi-user.target
[Service] [Service]
User=dt User=dt
WorkingDirectory=/home/dt WorkingDirectory=/home/dt
ExecStart=/usr/local/bin/ttyd -p 8080 -u dt -m 1 /usr/local/bin/pm3 ExecStart=/usr/local/bin/ttyd -p 8080 -W -u $USER_UID -m 1 /usr/local/bin/pm3
Restart=always Restart=always
Type=simple Type=simple
RestartSec=1 RestartSec=1