|
[-]
[+]
|
Changed |
mini-image-iso.kiwi
|
| @@ -15,7 +15,6 @@
<!-- iso image -->
<type checkprebuilt="true" boot="isoboot/suse-12.3" filesystem="ext4" compressed="true" bootprofile="std" bootkernel="default" flags="clic" image="iso" />
- </preferences>
<!-- empty
just to convince diff3 on version updates
|
|
[-]
[+]
|
Changed |
mini-image-net.kiwi
^
|
| @@ -15,7 +15,6 @@
<!-- pxe image -->
<type checkprebuilt="true" boot="netboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" bootprofile="std" bootkernel="default" image="pxe"/>
- </preferences>
<!-- empty
just to convince diff3 on version updates
|
|
[-]
[+]
|
Changed |
mini-image-vmx.kiwi
^
|
| @@ -15,16 +15,12 @@
<!-- vmx image -->
<type boot="vmxboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" primary="true" format="vmdk" bootloader="grub2" image="vmx" bootprofile="std" bootkernel="default" kernelcmdline="nomodeset">
- <machine memory="2048" guestOS="suse" HWversion="4">
- <vmnic driver="e1000" interface="0" mode="bridged"/>
- <vmdisk controller="scsi" id="0"/>
- </machine>
- <size unit="M" additive="false">2048</size>
+ <machine memory="2048" guestOS="suse" HWversion="4">
+ <vmnic driver="e1000" interface="0" mode="bridged"/>
+ <vmdisk controller="scsi" id="0"/>
+ </machine>
+ <size unit="M" additive="false">2048</size>
</type>
- <!-- empty
- just to convince diff3 on version updates
- -->
- </preferences>
<!-- empty
just to convince diff3 on version updates
|
|
[-]
[+]
|
Changed |
mini-image.pref-iso
^
|
| @@ -1,4 +1,3 @@
<!-- iso image -->
<type checkprebuilt="true" boot="isoboot/suse-12.3" filesystem="ext4" compressed="true" bootprofile="std" bootkernel="default" flags="clic" image="iso" />
- </preferences>
|
|
[-]
[+]
|
Changed |
mini-image.pref-net
^
|
| @@ -1,4 +1,3 @@
<!-- pxe image -->
<type checkprebuilt="true" boot="netboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" bootprofile="std" bootkernel="default" image="pxe"/>
- </preferences>
|
|
[-]
[+]
|
Changed |
mini-image.pref-vmx
^
|
| @@ -1,13 +1,9 @@
<!-- vmx image -->
<type boot="vmxboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" primary="true" format="vmdk" bootloader="grub2" image="vmx" bootprofile="std" bootkernel="default" kernelcmdline="nomodeset">
- <machine memory="2048" guestOS="suse" HWversion="4">
- <vmnic driver="e1000" interface="0" mode="bridged"/>
- <vmdisk controller="scsi" id="0"/>
- </machine>
- <size unit="M" additive="false">2048</size>
+ <machine memory="2048" guestOS="suse" HWversion="4">
+ <vmnic driver="e1000" interface="0" mode="bridged"/>
+ <vmdisk controller="scsi" id="0"/>
+ </machine>
+ <size unit="M" additive="false">2048</size>
</type>
- <!-- empty
- just to convince diff3 on version updates
- -->
- </preferences>
|
