Merge pull request #258 from amutu/master

fix config for installing and running alpine 3.8
This commit is contained in:
Matt Churchyard
2019-02-08 09:41:28 +00:00
committed by GitHub
2 changed files with 6 additions and 6 deletions

View File

@@ -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"

4
vm.8
View File

@@ -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.