From 08fcbff1476f799a9e4da7b7c5bad350c3da578b Mon Sep 17 00:00:00 2001 From: Jov Date: Sat, 13 Oct 2018 17:42:13 +0800 Subject: [PATCH 1/2] fix config for installing and running alpine 3.8 --- sample-templates/alpine.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sample-templates/alpine.conf b/sample-templates/alpine.conf index 4278b12..8d58021 100644 --- a/sample-templates/alpine.conf +++ b/sample-templates/alpine.conf @@ -5,7 +5,7 @@ network0_type="virtio-net" network0_switch="public" disk0_type="virtio-blk" disk0_name="disk0.img" -grub_install0="linux /boot/vmlinuz-hardened initrd=/boot/initramfs-hardened alpine_dev=cdrom:iso9660 modules=loop,squashfs,sd-mod,usb-storage,sr-mod" -grub_install1="initrd /boot/initramfs-hardened" -grub_run0="linux /boot/vmlinuz-hardened root=/dev/vda3 modules=ext4" -grub_run1="initrd /boot/initramfs-hardened" +grub_install0="linux /boot/vmlinuz-vanilla initrd=/boot/initramfs-vanilla alpine_dev=cdrom:iso9660 modules=loop,squashfs,sd-mod,usb-storage,sr-mod" +grub_install1="initrd /boot/initramfs-vanilla" +grub_run0="linux /boot/vmlinuz-vanilla root=/dev/vda3 modules=ext4" +grub_run1="initrd /boot/initramfs-vanilla" From 73e95b3b0246c84b5c7f66b86e7e3eb41939be22 Mon Sep 17 00:00:00 2001 From: Jov Date: Mon, 15 Oct 2018 15:07:38 +0800 Subject: [PATCH 2/2] fix missing name for switch address/private cmd --- vm.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vm.8 b/vm.8 index 566c6f4..b445cf7 100644 --- a/vm.8 +++ b/vm.8 @@ -524,7 +524,7 @@ removed from the bridge, reconfigured, then re-added. To remove the VLAN configuration from a virtual switch, specify a .Ar vlan-id of 0. -.It Cm switch address Ar a.b.c.d/xx|none +.It Cm switch address Ar name Ar a.b.c.d/xx|none Configure an IP address for the specified virtual switch. The address should be specified in CIDR notation. To remove an address, specify .Pa none @@ -534,7 +534,7 @@ If NAT funtionality is required, please configure an address on the switch to become the gateway address for guests. Source NAT rules can then be created using your choice of firewall or NAT daemon. If DHCP is desired, we recommend using a manual switch and configuring this by hand. -.It Cm switch private Ar on|off +.It Cm switch private Ar name Ar on|off Enable of disable private mode for a virtual switch. In private mode, guests will only be able to communicate with the physical interface(s), not with each other.