summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.vimrc2
-rwxr-xr-xbin/update_kernel_host8
-rwxr-xr-xbin/vm10
-rwxr-xr-xbin/wol4
4 files changed, 17 insertions, 7 deletions
diff --git a/.vimrc b/.vimrc
index 68ae82a..fd1fbbc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -25,7 +25,7 @@ let g:go_list_type = "quickfix"
let g:go_fmt_command = "gopls"
let g:go_gopls_gofumpt = 1
let g:go_metalinter_command = "golangci-lint"
-autocmd FileType go syntax on
+"autocmd FileType go syntax on
autocmd FileType go nmap <leader>b <Plug>(go-build)
autocmd FileType go nmap <leader>i <Plug>(go-info)
autocmd FileType go nmap <leader>r <Plug>(go-run)
diff --git a/bin/update_kernel_host b/bin/update_kernel_host
new file mode 100755
index 0000000..6180921
--- /dev/null
+++ b/bin/update_kernel_host
@@ -0,0 +1,8 @@
+#!/bin/sh -ex
+
+# After 'apk upgrade', update kernel and initrd on VM host
+
+sudo cp /boot/initramfs-virt /tmp
+sudo chmod a+r /tmp/initramfs-virt
+gunzip < /boot/vmlinuz-virt > /tmp/vmlinux
+scp /tmp/initramfs-virt /tmp/vmlinux marc@m1:.vm/vm1/
diff --git a/bin/vm b/bin/vm
index 732ba49..97e3521 100755
--- a/bin/vm
+++ b/bin/vm
@@ -212,11 +212,12 @@ ls() {
}
start() {
- usage 'start [-af] name' 'Start a VM' && return
- while getopts :af opt; do
+ usage 'start [-afs] name' 'Start a VM' && return
+ while getopts :afs opt; do
case $opt in
(a) a=1 ;;
(f) f=1 ;;
+ (s) s=1 ;;
(*) Opth=1 start "$1"; exit;;
esac
done
@@ -227,8 +228,9 @@ start() {
cd "$dir/$1" || die "start $1 failed"
[ -f vftool.pid ] && die "Error: process $(cat vftool.pid) is active or $PWD/vftool.pid should be removed"
start_vm & sleep 2
- [ "$f" ] && finalize
- [ "$a" ] && vm console "$1"
+ ! [ "$f" ] || finalize
+ ! [ "$a" ] || vm console "$1"
+ ! [ "$s" ] || exec ssh "$1"
}
start_vm() (
diff --git a/bin/wol b/bin/wol
index 39bce0d..7975df9 100755
--- a/bin/wol
+++ b/bin/wol
@@ -1,6 +1,6 @@
-#!/bin/sh -x
+#!/bin/sh
ip_plex=192.168.1.90 mac_plex=b0:83:fe:61:a7:aa
eval "mac=\$mac_$1 ip=\$ip_$1"
wakeonlan "$mac"
-ping -o "$ip"
+while ! nc -zw 2 "$ip" 22; do printf .; sleep 2; done
ssh "root@$ip"