Merge pull request #125 from gh0stshell/master

Updated depends, updated bmap check
This commit is contained in:
evilsocket 2019-10-04 10:40:10 +02:00 committed by GitHub
commit 046e9a0fe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions

View File

@ -38,9 +38,17 @@ For hackers to learn reinforcement learning, WiFi networking and have an excuse
- [Project Twitter](https://twitter.com/pwnagotchi) - [Project Twitter](https://twitter.com/pwnagotchi)
- [Project Website](https://pwnagotchi.ai/) - [Project Website](https://pwnagotchi.ai/)
## Known Bugs
- GLib-ERROR **: 20:50:46.361: getauxval () failed: No such file or directory
Affected DEB & Versions: QEMU <=2.11
Fix: Upgrade QEMU to >=3.1
Bug Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923289
## License ## License
`pwnagotchi` is made with ♥ by [@evilsocket](https://twitter.com/evilsocket) and the [amazing dev team](https://github.com/evilsocket/pwnagotchi/graphs/contributors). It's released under the GPL3 license. `pwnagotchi` is made with ♥ by [@evilsocket](https://twitter.com/evilsocket) and the [amazing dev team](https://github.com/evilsocket/pwnagotchi/graphs/contributors). It's released under the GPL3 license.

View File

@ -5,7 +5,7 @@
set -eu set -eu
REQUIREMENTS=( wget gunzip git dd e2fsck resize2fs parted losetup qemu-system-x86_64 ) REQUIREMENTS=( wget gunzip git dd e2fsck resize2fs parted losetup qemu-system-x86_64 )
DEBREQUIREMENTS=( wget gzip git parted qemu-system-x86 qemu-user-static bmap-tools ) DEBREQUIREMENTS=( wget gzip git parted qemu-system-x86 qemu-user-static )
REPO_DIR="$(dirname "$(dirname "$(realpath "$0")")")" REPO_DIR="$(dirname "$(dirname "$(realpath "$0")")")"
TMP_DIR="${REPO_DIR}/tmp" TMP_DIR="${REPO_DIR}/tmp"
MNT_DIR="${TMP_DIR}/mnt" MNT_DIR="${TMP_DIR}/mnt"
@ -93,15 +93,13 @@ function provide_raspbian() {
function setup_raspbian(){ function setup_raspbian(){
# Detect the ability to create sparse files # Detect the ability to create sparse files
if [ "${OPT_SPARSE}" -eq 0 ]; if [ "${OPT_SPARSE}" -eq 0 ]; then
then if [ which bmaptool -eq 0 ]; then
which bmaptool >/dev/null 2>&1 echo "[!] bmaptool not available, not creating a sparse image"
if [ $? -eq 0 ];
then else
echo "[+] Defaulting to sparse image generation as bmaptool is available" echo "[+] Defaulting to sparse image generation as bmaptool is available"
OPT_SPARSE=1 OPT_SPARSE=1
else
echo "[!] bmaptool not available, not creating a sparse image"
fi fi
fi fi