diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-04-19 04:36:19 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-04-19 04:36:19 +0200 |
| commit | e6bb8072e00da2e698fb472d3c8c18f9cecfd3dd (patch) | |
| tree | 9162952694f2511cfdae0524f235feca56fa43b3 /scripts | |
| parent | e954d454746b722648277a95230c2cad272ee860 (diff) | |
| parent | 4700953e297af1d07215b81f9490eceeae98e7a0 (diff) | |
| download | vyos-build-e6bb8072e00da2e698fb472d3c8c18f9cecfd3dd.tar.gz vyos-build-e6bb8072e00da2e698fb472d3c8c18f9cecfd3dd.zip | |
Merge branch 'current' of https://github.com/vyos/vyos-build into current
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-vmware-image | 8 | ||||
| -rw-r--r-- | scripts/template.ovf | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build-vmware-image b/scripts/build-vmware-image index 5ad6615a..dc680378 100755 --- a/scripts/build-vmware-image +++ b/scripts/build-vmware-image @@ -142,22 +142,22 @@ set timeout=5 set default=0 menuentry "VyOS (KVM console)" { - linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=ttyS0,9600 console=tty0 systemd.show_status=true + linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=ttyS0,115200 console=tty0 systemd.show_status=true initrd /boot/"$version"/initrd.img } menuentry "Lost password change (KVM console)" { - linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=ttyS0,9600 console=tty0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=ttyS0,115200 console=tty0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot/"$version"/initrd.img } menuentry "VyOS $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,9600n8d consoleblank=0 systemd.show_status=true + linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8d consoleblank=0 systemd.show_status=true initrd /boot/"$version"/initrd.img } menuentry "Lost password change $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,9600n8d consoleblank=0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8d consoleblank=0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot/"$version"/initrd.img } EOF diff --git a/scripts/template.ovf b/scripts/template.ovf index cc2ec845..87237bf7 100644 --- a/scripts/template.ovf +++ b/scripts/template.ovf @@ -87,7 +87,7 @@ <Info/> <Annotation>VyOS</Annotation> </AnnotationSection> - <OperatingSystemSection ovf:id="100" ovf:version="1" vmw:osType="other3xLinux64Guest"> + <OperatingSystemSection ovf:id="100" ovf:version="1" vmw:osType="debian8_64Guest"> <Info>Guest Operating System</Info> <Description>VyOS</Description> </OperatingSystemSection> @@ -148,9 +148,9 @@ </Item> <Item> <rasd:Address xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</rasd:Address> - <rasd:ElementName xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller 0 - LSI Logic</rasd:ElementName> + <rasd:ElementName xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller 0</rasd:ElementName> <rasd:InstanceID xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</rasd:InstanceID> - <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType> + <rasd:ResourceSubType>VirtualSCSI</rasd:ResourceSubType> <rasd:ResourceType>6</rasd:ResourceType> </Item> <Item> |