diff options
| author | nachoparker <nacho@ownyourbits.com> | 2019-07-20 01:52:33 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2019-07-20 19:46:27 +0300 |
| commit | 404907f922ffd487c848a9aeac5b70292acd535b (patch) | |
| tree | d7d80e2537acab8bafa33fc66b055ce16adaa6ec | |
| parent | e4bd5feb665f1ba924887e4dcd7e1cca665898b7 (diff) | |
raspi: fix dhcp bug
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rwxr-xr-x | build-SD-rpi.sh | 7 | ||||
| -rw-r--r-- | buildlib.sh | 2 | ||||
| -rw-r--r-- | updates/1.15.0.sh | 22 | ||||
| -rw-r--r-- | updates/1.16.0.sh | 31 |
4 files changed, 39 insertions, 23 deletions
diff --git a/build-SD-rpi.sh b/build-SD-rpi.sh index 178913bc..d4195ebd 100755 --- a/build-SD-rpi.sh +++ b/build-SD-rpi.sh @@ -72,6 +72,13 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \ run_app_unsafe bin/ncp/CONFIG/nc-init.sh run_app_unsafe post-inst.sh + # work around dhcpcd Raspbian bug + # https://lb.raspberrypi.org/forums/viewtopic.php?t=230779 + # https://github.com/nextcloud/nextcloudpi/issues/938 + apt-get update + apt-get install -y --no-install-recommends haveged + systemctl enable haveged.service + # harden SSH further for Raspbian sed -i 's|^#PermitRootLogin .*|PermitRootLogin no|' /etc/ssh/sshd_config diff --git a/buildlib.sh b/buildlib.sh index b1087df8..2d2bc4fe 100644 --- a/buildlib.sh +++ b/buildlib.sh @@ -345,7 +345,7 @@ rm $IMGNAME.torrent put $IMGNAME.torrent bye EOF - cd - + cd - cd torrent/$IMGNAME ftp -np ftp.ownyourbits.com <<EOF diff --git a/updates/1.15.0.sh b/updates/1.15.0.sh deleted file mode 100644 index ab39d8af..00000000 --- a/updates/1.15.0.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -e - -## BACKWARD FIXES ( for older images ) - -source /usr/local/etc/library.sh - -# all images - -# docker images only -[[ -f /.docker-image ]] && { -: -} - -# for non docker images -[[ ! -f /.docker-image ]] && { -# Update btrfs-sync -wget -q https://raw.githubusercontent.com/nachoparker/btrfs-sync/master/btrfs-sync -O /usr/local/bin/btrfs-sync -} - -exit 0 diff --git a/updates/1.16.0.sh b/updates/1.16.0.sh new file mode 100644 index 00000000..0bf635ae --- /dev/null +++ b/updates/1.16.0.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -e + +## BACKWARD FIXES ( for older images ) + +source /usr/local/etc/library.sh + +# all images + +# docker images only +[[ -f /.docker-image ]] && { +: +} + +# for non docker images +[[ ! -f /.docker-image ]] && { + # Update btrfs-sync + wget -q https://raw.githubusercontent.com/nachoparker/btrfs-sync/master/btrfs-sync -O /usr/local/bin/btrfs-sync + + # work around dhcpcd Raspbian bug + # https://lb.raspberrypi.org/forums/viewtopic.php?t=230779 + # https://github.com/nextcloud/nextcloudpi/issues/938 + test -f /usr/bin/raspi-config && { + apt-get update + apt-get install -y --no-install-recommends haveged + systemctl enable haveged.service + } +} + +exit 0 |