浏览代码

do not disable server on install

Tobias Simetsreiter 4 年之前
父节点
当前提交
7fd1cb867a
共有 2 个文件被更改,包括 0 次插入32 次删除
  1. 0 2
      src/bootstrap_captive/install.py
  2. 0 30
      src/install.sh

+ 0 - 2
src/bootstrap_captive/install.py

@@ -76,7 +76,6 @@ set -x
 dpkg -l hostapd dnsmasq python3-rpi.gpio 2>&1 1> /dev/null || dpkg -i -R blob/
 systemctl unmask hostapd.service
 systemctl disable hostapd.service dnsmasq.service
-systemctl disable bootstrap_captive@server.service || true
 sed -i 's/^source-directory.*$/source \/etc\/network\/interfaces.d\/*/' /etc/network/interfaces
 touch /etc/network/interfaces.d/wlan0.conf
 rm -f /etc/hostapd/hostapd.conf
@@ -87,7 +86,6 @@ rm -f /lib/systemd/system/bootstrap_captive_server.service
 rm -f /lib/systemd/system/bootstrap_captive@.service
 ln -s "{0}/bootstrap_captive_server.service" /lib/systemd/system/
 systemctl daemon-reload
-systemctl disable bootstrap_captive_server.service
 
 """.format(args.install_dir)
     from subprocess import run

+ 0 - 30
src/install.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-ls -alh
-
-INSTALL_DIR="/opt/eu.tsimnet.git/dasimmet/raspi-captive-bootstrap"
-mkdir -p "$INSTALL_DIR/"
-rsync -a ./ "$INSTALL_DIR/"
-
-echo "Ending Install"
-exit 0
-dpkg -i hostapd.deb
-mkdir -p /etc/hostapd/
-cp /etc/hostapd/hostapd.conf /etc/hostapd/hostapd.conf.orig
-cp hostapd.conf /etc/hostapd/hostapd.conf
-cp bootstrap_portal.service /etc/systemd/system/
-
-sed -e "s/DAEMON_CONF=\".*/\/etc\/hostapd\/hostapd.conf/" /etc/default/hostapd
-
-cat << 'EOF' > /etc/dnsmasq.d/bootstrap_portal.conf
-EOF
-
-cat << 'EOF' > /etc/systemd/system/bootstap_portal
-EOF
-
-systemctl daemon-reload
-systemctl disable dhcpcd
-systemctl enable hostapd dnsmasq bootstrap_portal
-cp $0 /usr/local/bin/bootstap_portal.sh
-