diff --git a/usr/bin/alpine-qemu-install b/usr/bin/alpine-qemu-install index 1209f35..5170067 100755 --- a/usr/bin/alpine-qemu-install +++ b/usr/bin/alpine-qemu-install @@ -39,16 +39,16 @@ echo "iso = $ISO" qemu-system-x86_64 \ -m $RAM \ - -nic user \ -boot once=d \ -cdrom $ISO \ -drive file=$IMG \ - -nic user,hostfwd=tcp::2222-:22 \ + -display none \ -device virtio-vga \ -enable-kvm \ - -display default,show-cursor=on \ - -display none \ - -virtfs local,id=share,path="$SHARE",security_model=none,mount_tag=hostshare + -net user,hostfwd=tcp::7777-:22 + -net nic + #-virtfs local,id=share,path="$SHARE",security_model=none,mount_tag=hostshare + ## --- Run QEMU with graphics + shared folder --- #qemu-system-x86_64 \ diff --git a/usr/bin/conn b/usr/bin/conn index bd65458..f303ae7 100755 --- a/usr/bin/conn +++ b/usr/bin/conn @@ -1,6 +1,10 @@ #!/usr/bin/bash +iwctl station wlan0 scan if [ "$#" -lt 1 ] ; then + iwctl station wlan0 get-networks + echo + echo echo "Usage: $0 USSID" exit 1 fi diff --git a/usr/bin/greplast b/usr/bin/greplast new file mode 100755 index 0000000..681539e --- /dev/null +++ b/usr/bin/greplast @@ -0,0 +1,6 @@ +#!/usr/bin/bash + +echo "prev" +grepip $LOG_CONN_DIR/prev.log +echo "last" +grepip $LOG_CONN diff --git a/usr/bin/nmap_sA b/usr/bin/nmap_sA index a98376e..bc25e1e 100755 --- a/usr/bin/nmap_sA +++ b/usr/bin/nmap_sA @@ -1,6 +1,10 @@ #!/bin/bash nmap_sA () { +<<<<<<< HEAD nmap -Pn -sA --reason $@ +======= + nmap -sA --reason -Pn +>>>>>>> d4ee7bf (modified: alpine-qemu-install) } nmap_sA "$@"