|
[-]
[+]
|
Changed |
mini-image-iso.kiwi
|
| @@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<image name='mini-image' displayname='mini-image' schemaversion='5.6'>
- <description type='system'>
+<?xml version="1.0" encoding="UTF-8"?>
+<image name="mini-image" displayname="mini-image" schemaversion="4.7">
+ <description type="system">
<author>Carsten Schoene</author>
<contact>cs@linux-administrator.com</contact>
<specification>mini-image</specification>
</description>
<profiles>
- <profile name='net' description='PXE Image' />
- <profile name='usb' description='HDD/USB Image' />
- <profile name='iso' description='ISO Image' />
- <profile name='vmx' description='VMWare Image' />
+ <profile name="net" description="PXE Image" />
+ <profile name="usb" description="HDD/USB Image" />
+ <profile name="iso" description="ISO Image" />
+ <profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
<version>0.0.1</version>
@@ -19,75 +19,76 @@
<timezone>Europe/Berlin</timezone>
<hwclock>localtime</hwclock>
<locale>en_US</locale>
+ <boot-theme>none</boot-theme>
<!-- iso image -->
- <type checkprebuilt='true' boot='isoboot/suse-12.3' filesystem='ext4' compressed='true' bootprofile='std' bootkernel='default' flags='clic' image='iso' />
+ <type checkprebuilt="true" boot="isoboot/suse-12.3" filesystem="ext4" compressed="true" bootprofile="std" bootkernel="default" flags="clic" image="iso" />
</preferences>
- <users group='root'>
- <!-- schemaversion 5.3
- <user name='root' pwd='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
+ <users group="root">
+ <!-- schemaversion 5.3 -->
+ <user name="root" pwd="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
+ <!-- schemaversion 5.6
+ <user name="root" password="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
-->
- <!-- schemaversion 5.6 -->
- <user name='root' password='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
</users>
- <packages type='image' patternType='onlyRequired'>
+ <packages type="image" patternType="onlyRequired">
<!-- not available in 12.3rc1
- <package name='systemd-presets-branding-basedonopensuse'/>
- <package name='plymouth-branding-basedonopensuse'/>
+ <package name="systemd-presets-branding-basedonopensuse"/>
+ <package name="plymouth-branding-basedonopensuse"/>
-->
- <package name='systemd-sysvinit'/>
- <package name='libmozjs185-1_0'/>
- <package name='rsync'/>
- <package name='wget'/>
- <package name='curl'/>
- <package name='nfs-client'/>
- <package name='p7zip'/>
- <package name='gptfdisk-fixparts'/>
- <package name='gptfdisk'/>
- <package name='parted'/>
- <package name='hdparm'/>
- <package name='dialog'/>
- <package name='aaa_base'/>
- <package name='shim' arch='x86_64'/>
- <package name='grub2'/>
- <package name='grub'/>
- <package name='hwinfo'/>
- <package name='iputils'/>
- <package name='kernel-default'/>
- <package name='netcfg'/>
- <package name='openSUSE-build-key'/>
- <package name='openssh'/>
- <package name='polkit-default-privs'/>
- <package name='rpcbind'/>
- <package name='syslog-ng'/>
- <package name='vim'/>
- <package name='zypper'/>
- <package name='openSUSE-release-mini'/>
- <package name='elfutils'/>
- <package name='ncurses-utils'/>
- <package name='pkgconfig'/>
- <package name='metamail'/>
- <package name='tcsh'/>
+ <package name="systemd-sysvinit"/>
+ <package name="libmozjs185-1_0"/>
+ <package name="rsync"/>
+ <package name="wget"/>
+ <package name="curl"/>
+ <package name="nfs-client"/>
+ <package name="p7zip"/>
+ <package name="gptfdisk-fixparts"/>
+ <package name="gptfdisk"/>
+ <package name="parted"/>
+ <package name="hdparm"/>
+ <package name="dialog"/>
+ <package name="aaa_base"/>
+ <package name="shim" arch="x86_64"/>
+ <package name="grub2"/>
+ <package name="grub"/>
+ <package name="hwinfo"/>
+ <package name="iputils"/>
+ <package name="kernel-default"/>
+ <package name="netcfg"/>
+ <package name="openSUSE-build-key"/>
+ <package name="openssh"/>
+ <package name="polkit-default-privs"/>
+ <package name="rpcbind"/>
+ <package name="syslog-ng"/>
+ <package name="vim"/>
+ <package name="zypper"/>
+ <package name="openSUSE-release-mini"/>
+ <package name="elfutils"/>
+ <package name="ncurses-utils"/>
+ <package name="pkgconfig"/>
+ <package name="metamail"/>
+ <package name="tcsh"/>
<!-- openSUSE 12.2 -->
- <package name='pwdutils'/>
+ <package name="pwdutils"/>
</packages>
- <packages type='bootstrap'>
- <package name='filesystem'/>
- <package name='glibc-locale'/>
+ <packages type="bootstrap">
+ <package name="filesystem"/>
+ <package name="glibc-locale"/>
<package name="module-init-tools"/>
</packages>
<!-- openSUSE 12.2 -->
- <packages type='image' profiles='iso'>
- <package name='libxtables9'/>
+ <packages type="image" profiles="iso">
+ <package name="libxtables9"/>
</packages>
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
</repository>
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3:Update/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
</repository>
<!-- disable external kiwi -->
- <repository type='rpm-md'>
- <source path='obs://virtualization:Appliances/openSUSE_12.3/'/>
+ <repository type="rpm-md">
+ <source path="obs://virtualization:Appliances/openSUSE_12.3/"/>
</repository>
<!-- end disable -->
</image>
|
|
[-]
[+]
|
Changed |
mini-image-net.kiwi
^
|
| @@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<image name='mini-image' displayname='mini-image' schemaversion='5.6'>
- <description type='system'>
+<?xml version="1.0" encoding="UTF-8"?>
+<image name="mini-image" displayname="mini-image" schemaversion="4.7">
+ <description type="system">
<author>Carsten Schoene</author>
<contact>cs@linux-administrator.com</contact>
<specification>mini-image</specification>
</description>
<profiles>
- <profile name='net' description='PXE Image' />
- <profile name='usb' description='HDD/USB Image' />
- <profile name='iso' description='ISO Image' />
- <profile name='vmx' description='VMWare Image' />
+ <profile name="net" description="PXE Image" />
+ <profile name="usb" description="HDD/USB Image" />
+ <profile name="iso" description="ISO Image" />
+ <profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
<version>0.0.1</version>
@@ -19,75 +19,76 @@
<timezone>Europe/Berlin</timezone>
<hwclock>localtime</hwclock>
<locale>en_US</locale>
+ <boot-theme>none</boot-theme>
<!-- pxe image -->
- <type checkprebuilt='true' boot='netboot/suse-12.3' fsnocheck='true' filesystem='ext4' compressed='true' bootprofile='std' bootkernel='default' image='pxe'/>
+ <type checkprebuilt="true" boot="netboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" bootprofile="std" bootkernel="default" image="pxe"/>
</preferences>
- <users group='root'>
- <!-- schemaversion 5.3
- <user name='root' pwd='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
+ <users group="root">
+ <!-- schemaversion 5.3 -->
+ <user name="root" pwd="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
+ <!-- schemaversion 5.6
+ <user name="root" password="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
-->
- <!-- schemaversion 5.6 -->
- <user name='root' password='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
</users>
- <packages type='image' patternType='onlyRequired'>
+ <packages type="image" patternType="onlyRequired">
<!-- not available in 12.3rc1
- <package name='systemd-presets-branding-basedonopensuse'/>
- <package name='plymouth-branding-basedonopensuse'/>
+ <package name="systemd-presets-branding-basedonopensuse"/>
+ <package name="plymouth-branding-basedonopensuse"/>
-->
- <package name='systemd-sysvinit'/>
- <package name='libmozjs185-1_0'/>
- <package name='rsync'/>
- <package name='wget'/>
- <package name='curl'/>
- <package name='nfs-client'/>
- <package name='p7zip'/>
- <package name='gptfdisk-fixparts'/>
- <package name='gptfdisk'/>
- <package name='parted'/>
- <package name='hdparm'/>
- <package name='dialog'/>
- <package name='aaa_base'/>
- <package name='shim' arch='x86_64'/>
- <package name='grub2'/>
- <package name='grub'/>
- <package name='hwinfo'/>
- <package name='iputils'/>
- <package name='kernel-default'/>
- <package name='netcfg'/>
- <package name='openSUSE-build-key'/>
- <package name='openssh'/>
- <package name='polkit-default-privs'/>
- <package name='rpcbind'/>
- <package name='syslog-ng'/>
- <package name='vim'/>
- <package name='zypper'/>
- <package name='openSUSE-release-mini'/>
- <package name='elfutils'/>
- <package name='ncurses-utils'/>
- <package name='pkgconfig'/>
- <package name='metamail'/>
- <package name='tcsh'/>
+ <package name="systemd-sysvinit"/>
+ <package name="libmozjs185-1_0"/>
+ <package name="rsync"/>
+ <package name="wget"/>
+ <package name="curl"/>
+ <package name="nfs-client"/>
+ <package name="p7zip"/>
+ <package name="gptfdisk-fixparts"/>
+ <package name="gptfdisk"/>
+ <package name="parted"/>
+ <package name="hdparm"/>
+ <package name="dialog"/>
+ <package name="aaa_base"/>
+ <package name="shim" arch="x86_64"/>
+ <package name="grub2"/>
+ <package name="grub"/>
+ <package name="hwinfo"/>
+ <package name="iputils"/>
+ <package name="kernel-default"/>
+ <package name="netcfg"/>
+ <package name="openSUSE-build-key"/>
+ <package name="openssh"/>
+ <package name="polkit-default-privs"/>
+ <package name="rpcbind"/>
+ <package name="syslog-ng"/>
+ <package name="vim"/>
+ <package name="zypper"/>
+ <package name="openSUSE-release-mini"/>
+ <package name="elfutils"/>
+ <package name="ncurses-utils"/>
+ <package name="pkgconfig"/>
+ <package name="metamail"/>
+ <package name="tcsh"/>
<!-- openSUSE 12.2 -->
- <package name='pwdutils'/>
+ <package name="pwdutils"/>
</packages>
- <packages type='bootstrap'>
- <package name='filesystem'/>
- <package name='glibc-locale'/>
+ <packages type="bootstrap">
+ <package name="filesystem"/>
+ <package name="glibc-locale"/>
<package name="module-init-tools"/>
</packages>
<!-- openSUSE 12.2 -->
- <packages type='image' profiles='iso'>
- <package name='libxtables9'/>
+ <packages type="image" profiles="iso">
+ <package name="libxtables9"/>
</packages>
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
</repository>
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3:Update/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
</repository>
<!-- disable external kiwi -->
- <repository type='rpm-md'>
- <source path='obs://virtualization:Appliances/openSUSE_12.3/'/>
+ <repository type="rpm-md">
+ <source path="obs://virtualization:Appliances/openSUSE_12.3/"/>
</repository>
<!-- end disable -->
</image>
|
|
[-]
[+]
|
Changed |
mini-image-usb.kiwi
^
|
| @@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<image name='mini-image' displayname='mini-image' schemaversion='5.6'>
- <description type='system'>
+<?xml version="1.0" encoding="UTF-8"?>
+<image name="mini-image" displayname="mini-image" schemaversion="4.7">
+ <description type="system">
<author>Carsten Schoene</author>
<contact>cs@linux-administrator.com</contact>
<specification>mini-image</specification>
</description>
<profiles>
- <profile name='net' description='PXE Image' />
- <profile name='usb' description='HDD/USB Image' />
- <profile name='iso' description='ISO Image' />
- <profile name='vmx' description='VMWare Image' />
+ <profile name="net" description="PXE Image" />
+ <profile name="usb" description="HDD/USB Image" />
+ <profile name="iso" description="ISO Image" />
+ <profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
<version>0.0.1</version>
@@ -19,8 +19,9 @@
<timezone>Europe/Berlin</timezone>
<hwclock>localtime</hwclock>
<locale>en_US</locale>
+ <boot-theme>none</boot-theme>
<!-- usb image -->
- <type checkprebuilt='true' boot='oemboot/suse-12.3' fsnocheck='true' filesystem='ext4' compressed='true' bootloader='grub2' image='oem' >
+ <type checkprebuilt="true" boot="oemboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" bootloader="grub2" image="oem" >
<oemconfig>
<oem-swap>true</oem-swap>
<oem-swapsize>512</oem-swapsize>
@@ -28,73 +29,76 @@
<oem-systemsize>2048</oem-systemsize>
</oemconfig>
</type>
+ <!-- empty
+ just to convince diff3 on version updates
+ -->
</preferences>
- <users group='root'>
- <!-- schemaversion 5.3
- <user name='root' pwd='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
+ <users group="root">
+ <!-- schemaversion 5.3 -->
+ <user name="root" pwd="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
+ <!-- schemaversion 5.6
+ <user name="root" password="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
-->
- <!-- schemaversion 5.6 -->
- <user name='root' password='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
</users>
- <packages type='image' patternType='onlyRequired'>
+ <packages type="image" patternType="onlyRequired">
<!-- not available in 12.3rc1
- <package name='systemd-presets-branding-basedonopensuse'/>
- <package name='plymouth-branding-basedonopensuse'/>
+ <package name="systemd-presets-branding-basedonopensuse"/>
+ <package name="plymouth-branding-basedonopensuse"/>
-->
- <package name='systemd-sysvinit'/>
- <package name='libmozjs185-1_0'/>
- <package name='rsync'/>
- <package name='wget'/>
- <package name='curl'/>
- <package name='nfs-client'/>
- <package name='p7zip'/>
- <package name='gptfdisk-fixparts'/>
- <package name='gptfdisk'/>
- <package name='parted'/>
- <package name='hdparm'/>
- <package name='dialog'/>
- <package name='aaa_base'/>
- <package name='shim' arch='x86_64'/>
- <package name='grub2'/>
- <package name='grub'/>
- <package name='hwinfo'/>
- <package name='iputils'/>
- <package name='kernel-default'/>
- <package name='netcfg'/>
- <package name='openSUSE-build-key'/>
- <package name='openssh'/>
- <package name='polkit-default-privs'/>
- <package name='rpcbind'/>
- <package name='syslog-ng'/>
- <package name='vim'/>
- <package name='zypper'/>
- <package name='openSUSE-release-mini'/>
- <package name='elfutils'/>
- <package name='ncurses-utils'/>
- <package name='pkgconfig'/>
- <package name='metamail'/>
- <package name='tcsh'/>
+ <package name="systemd-sysvinit"/>
+ <package name="libmozjs185-1_0"/>
+ <package name="rsync"/>
+ <package name="wget"/>
+ <package name="curl"/>
+ <package name="nfs-client"/>
+ <package name="p7zip"/>
+ <package name="gptfdisk-fixparts"/>
+ <package name="gptfdisk"/>
+ <package name="parted"/>
+ <package name="hdparm"/>
+ <package name="dialog"/>
+ <package name="aaa_base"/>
+ <package name="shim" arch="x86_64"/>
+ <package name="grub2"/>
+ <package name="grub"/>
+ <package name="hwinfo"/>
+ <package name="iputils"/>
+ <package name="kernel-default"/>
+ <package name="netcfg"/>
+ <package name="openSUSE-build-key"/>
+ <package name="openssh"/>
+ <package name="polkit-default-privs"/>
+ <package name="rpcbind"/>
+ <package name="syslog-ng"/>
+ <package name="vim"/>
+ <package name="zypper"/>
+ <package name="openSUSE-release-mini"/>
+ <package name="elfutils"/>
+ <package name="ncurses-utils"/>
+ <package name="pkgconfig"/>
+ <package name="metamail"/>
+ <package name="tcsh"/>
<!-- openSUSE 12.2 -->
- <package name='pwdutils'/>
+ <package name="pwdutils"/>
</packages>
- <packages type='bootstrap'>
- <package name='filesystem'/>
- <package name='glibc-locale'/>
+ <packages type="bootstrap">
+ <package name="filesystem"/>
+ <package name="glibc-locale"/>
<package name="module-init-tools"/>
</packages>
<!-- openSUSE 12.2 -->
- <packages type='image' profiles='iso'>
- <package name='libxtables9'/>
+ <packages type="image" profiles="iso">
+ <package name="libxtables9"/>
</packages>
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
</repository>
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3:Update/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
</repository>
<!-- disable external kiwi -->
- <repository type='rpm-md'>
- <source path='obs://virtualization:Appliances/openSUSE_12.3/'/>
+ <repository type="rpm-md">
+ <source path="obs://virtualization:Appliances/openSUSE_12.3/"/>
</repository>
<!-- end disable -->
</image>
|
|
[-]
[+]
|
Changed |
mini-image-vmx.kiwi
^
|
| @@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<image name='mini-image' displayname='mini-image' schemaversion='5.6'>
- <description type='system'>
+<?xml version="1.0" encoding="UTF-8"?>
+<image name="mini-image" displayname="mini-image" schemaversion="4.7">
+ <description type="system">
<author>Carsten Schoene</author>
<contact>cs@linux-administrator.com</contact>
<specification>mini-image</specification>
</description>
<profiles>
- <profile name='net' description='PXE Image' />
- <profile name='usb' description='HDD/USB Image' />
- <profile name='iso' description='ISO Image' />
- <profile name='vmx' description='VMWare Image' />
+ <profile name="net" description="PXE Image" />
+ <profile name="usb" description="HDD/USB Image" />
+ <profile name="iso" description="ISO Image" />
+ <profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
<version>0.0.1</version>
@@ -19,81 +19,85 @@
<timezone>Europe/Berlin</timezone>
<hwclock>localtime</hwclock>
<locale>en_US</locale>
+ <boot-theme>none</boot-theme>
<!-- vmx image -->
- <type checkprebuilt='true' boot='vmxboot/suse-12.3' fsnocheck='true' filesystem='ext4' compressed='true' primary='true' format='vmdk' bootloader='grub2' image='vmx'>
- <machine memory='2048' guestOS='suse' HWversion='4'>
- <vmnic driver='e1000' interface='0' mode='bridged'/>
- <vmdisk controller='scsi' id='0'/>
+ <type checkprebuilt="true" boot="vmxboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" primary="true" format="vmdk" bootloader="grub2" image="vmx">
+ <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>
+ <size unit="M" additive="false">2048</size>
</type>
+ <!-- empty
+ just to convince diff3 on version updates
+ -->
</preferences>
- <users group='root'>
- <!-- schemaversion 5.3
- <user name='root' pwd='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
+ <users group="root">
+ <!-- schemaversion 5.3 -->
+ <user name="root" pwd="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
+ <!-- schemaversion 5.6
+ <user name="root" password="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
-->
- <!-- schemaversion 5.6 -->
- <user name='root' password='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
</users>
- <packages type='image' patternType='onlyRequired'>
+ <packages type="image" patternType="onlyRequired">
<!-- not available in 12.3rc1
- <package name='systemd-presets-branding-basedonopensuse'/>
- <package name='plymouth-branding-basedonopensuse'/>
+ <package name="systemd-presets-branding-basedonopensuse"/>
+ <package name="plymouth-branding-basedonopensuse"/>
-->
- <package name='systemd-sysvinit'/>
- <package name='libmozjs185-1_0'/>
- <package name='rsync'/>
- <package name='wget'/>
- <package name='curl'/>
- <package name='nfs-client'/>
- <package name='p7zip'/>
- <package name='gptfdisk-fixparts'/>
- <package name='gptfdisk'/>
- <package name='parted'/>
- <package name='hdparm'/>
- <package name='dialog'/>
- <package name='aaa_base'/>
- <package name='shim' arch='x86_64'/>
- <package name='grub2'/>
- <package name='grub'/>
- <package name='hwinfo'/>
- <package name='iputils'/>
- <package name='kernel-default'/>
- <package name='netcfg'/>
- <package name='openSUSE-build-key'/>
- <package name='openssh'/>
- <package name='polkit-default-privs'/>
- <package name='rpcbind'/>
- <package name='syslog-ng'/>
- <package name='vim'/>
- <package name='zypper'/>
- <package name='openSUSE-release-mini'/>
- <package name='elfutils'/>
- <package name='ncurses-utils'/>
- <package name='pkgconfig'/>
- <package name='metamail'/>
- <package name='tcsh'/>
+ <package name="systemd-sysvinit"/>
+ <package name="libmozjs185-1_0"/>
+ <package name="rsync"/>
+ <package name="wget"/>
+ <package name="curl"/>
+ <package name="nfs-client"/>
+ <package name="p7zip"/>
+ <package name="gptfdisk-fixparts"/>
+ <package name="gptfdisk"/>
+ <package name="parted"/>
+ <package name="hdparm"/>
+ <package name="dialog"/>
+ <package name="aaa_base"/>
+ <package name="shim" arch="x86_64"/>
+ <package name="grub2"/>
+ <package name="grub"/>
+ <package name="hwinfo"/>
+ <package name="iputils"/>
+ <package name="kernel-default"/>
+ <package name="netcfg"/>
+ <package name="openSUSE-build-key"/>
+ <package name="openssh"/>
+ <package name="polkit-default-privs"/>
+ <package name="rpcbind"/>
+ <package name="syslog-ng"/>
+ <package name="vim"/>
+ <package name="zypper"/>
+ <package name="openSUSE-release-mini"/>
+ <package name="elfutils"/>
+ <package name="ncurses-utils"/>
+ <package name="pkgconfig"/>
+ <package name="metamail"/>
+ <package name="tcsh"/>
<!-- openSUSE 12.2 -->
- <package name='pwdutils'/>
+ <package name="pwdutils"/>
</packages>
- <packages type='bootstrap'>
- <package name='filesystem'/>
- <package name='glibc-locale'/>
+ <packages type="bootstrap">
+ <package name="filesystem"/>
+ <package name="glibc-locale"/>
<package name="module-init-tools"/>
</packages>
<!-- openSUSE 12.2 -->
- <packages type='image' profiles='iso'>
- <package name='libxtables9'/>
+ <packages type="image" profiles="iso">
+ <package name="libxtables9"/>
</packages>
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
</repository>
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3:Update/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
</repository>
<!-- disable external kiwi -->
- <repository type='rpm-md'>
- <source path='obs://virtualization:Appliances/openSUSE_12.3/'/>
+ <repository type="rpm-md">
+ <source path="obs://virtualization:Appliances/openSUSE_12.3/"/>
</repository>
<!-- end disable -->
</image>
|
|
[-]
[+]
|
Changed |
mini-image.head
^
|
| @@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<image name='mini-image' displayname='mini-image' schemaversion='5.6'>
- <description type='system'>
+<?xml version="1.0" encoding="UTF-8"?>
+<image name="mini-image" displayname="mini-image" schemaversion="4.7">
+ <description type="system">
<author>Carsten Schoene</author>
<contact>cs@linux-administrator.com</contact>
<specification>mini-image</specification>
</description>
<profiles>
- <profile name='net' description='PXE Image' />
- <profile name='usb' description='HDD/USB Image' />
- <profile name='iso' description='ISO Image' />
- <profile name='vmx' description='VMWare Image' />
+ <profile name="net" description="PXE Image" />
+ <profile name="usb" description="HDD/USB Image" />
+ <profile name="iso" description="ISO Image" />
+ <profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
<version>0.0.1</version>
@@ -19,3 +19,4 @@
<timezone>Europe/Berlin</timezone>
<hwclock>localtime</hwclock>
<locale>en_US</locale>
+ <boot-theme>none</boot-theme>
|
|
[-]
[+]
|
Changed |
mini-image.packages
^
|
| @@ -1,50 +1,50 @@
- <packages type='image' patternType='onlyRequired'>
+ <packages type="image" patternType="onlyRequired">
<!-- not available in 12.3rc1
- <package name='systemd-presets-branding-basedonopensuse'/>
- <package name='plymouth-branding-basedonopensuse'/>
+ <package name="systemd-presets-branding-basedonopensuse"/>
+ <package name="plymouth-branding-basedonopensuse"/>
-->
- <package name='systemd-sysvinit'/>
- <package name='libmozjs185-1_0'/>
- <package name='rsync'/>
- <package name='wget'/>
- <package name='curl'/>
- <package name='nfs-client'/>
- <package name='p7zip'/>
- <package name='gptfdisk-fixparts'/>
- <package name='gptfdisk'/>
- <package name='parted'/>
- <package name='hdparm'/>
- <package name='dialog'/>
- <package name='aaa_base'/>
- <package name='shim' arch='x86_64'/>
- <package name='grub2'/>
- <package name='grub'/>
- <package name='hwinfo'/>
- <package name='iputils'/>
- <package name='kernel-default'/>
- <package name='netcfg'/>
- <package name='openSUSE-build-key'/>
- <package name='openssh'/>
- <package name='polkit-default-privs'/>
- <package name='rpcbind'/>
- <package name='syslog-ng'/>
- <package name='vim'/>
- <package name='zypper'/>
- <package name='openSUSE-release-mini'/>
- <package name='elfutils'/>
- <package name='ncurses-utils'/>
- <package name='pkgconfig'/>
- <package name='metamail'/>
- <package name='tcsh'/>
+ <package name="systemd-sysvinit"/>
+ <package name="libmozjs185-1_0"/>
+ <package name="rsync"/>
+ <package name="wget"/>
+ <package name="curl"/>
+ <package name="nfs-client"/>
+ <package name="p7zip"/>
+ <package name="gptfdisk-fixparts"/>
+ <package name="gptfdisk"/>
+ <package name="parted"/>
+ <package name="hdparm"/>
+ <package name="dialog"/>
+ <package name="aaa_base"/>
+ <package name="shim" arch="x86_64"/>
+ <package name="grub2"/>
+ <package name="grub"/>
+ <package name="hwinfo"/>
+ <package name="iputils"/>
+ <package name="kernel-default"/>
+ <package name="netcfg"/>
+ <package name="openSUSE-build-key"/>
+ <package name="openssh"/>
+ <package name="polkit-default-privs"/>
+ <package name="rpcbind"/>
+ <package name="syslog-ng"/>
+ <package name="vim"/>
+ <package name="zypper"/>
+ <package name="openSUSE-release-mini"/>
+ <package name="elfutils"/>
+ <package name="ncurses-utils"/>
+ <package name="pkgconfig"/>
+ <package name="metamail"/>
+ <package name="tcsh"/>
<!-- openSUSE 12.2 -->
- <package name='pwdutils'/>
+ <package name="pwdutils"/>
</packages>
- <packages type='bootstrap'>
- <package name='filesystem'/>
- <package name='glibc-locale'/>
+ <packages type="bootstrap">
+ <package name="filesystem"/>
+ <package name="glibc-locale"/>
<package name="module-init-tools"/>
</packages>
<!-- openSUSE 12.2 -->
- <packages type='image' profiles='iso'>
- <package name='libxtables9'/>
+ <packages type="image" profiles="iso">
+ <package name="libxtables9"/>
</packages>
|
|
[-]
[+]
|
Changed |
mini-image.pref-iso
^
|
| @@ -1,3 +1,3 @@
<!-- iso image -->
- <type checkprebuilt='true' boot='isoboot/suse-12.3' filesystem='ext4' compressed='true' bootprofile='std' bootkernel='default' flags='clic' image='iso' />
+ <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,3 +1,3 @@
<!-- pxe image -->
- <type checkprebuilt='true' boot='netboot/suse-12.3' fsnocheck='true' filesystem='ext4' compressed='true' bootprofile='std' bootkernel='default' image='pxe'/>
+ <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-usb
^
|
| @@ -1,5 +1,5 @@
<!-- usb image -->
- <type checkprebuilt='true' boot='oemboot/suse-12.3' fsnocheck='true' filesystem='ext4' compressed='true' bootloader='grub2' image='oem' >
+ <type checkprebuilt="true" boot="oemboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" bootloader="grub2" image="oem" >
<oemconfig>
<oem-swap>true</oem-swap>
<oem-swapsize>512</oem-swapsize>
@@ -7,4 +7,7 @@
<oem-systemsize>2048</oem-systemsize>
</oemconfig>
</type>
+ <!-- empty
+ just to convince diff3 on version updates
+ -->
</preferences>
|
|
[-]
[+]
|
Changed |
mini-image.pref-vmx
^
|
| @@ -1,9 +1,12 @@
<!-- vmx image -->
- <type checkprebuilt='true' boot='vmxboot/suse-12.3' fsnocheck='true' filesystem='ext4' compressed='true' primary='true' format='vmdk' bootloader='grub2' image='vmx'>
- <machine memory='2048' guestOS='suse' HWversion='4'>
- <vmnic driver='e1000' interface='0' mode='bridged'/>
- <vmdisk controller='scsi' id='0'/>
+ <type checkprebuilt="true" boot="vmxboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" primary="true" format="vmdk" bootloader="grub2" image="vmx">
+ <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>
+ <size unit="M" additive="false">2048</size>
</type>
+ <!-- empty
+ just to convince diff3 on version updates
+ -->
</preferences>
|
|
[-]
[+]
|
Changed |
mini-image.repos
^
|
| @@ -1,11 +1,11 @@
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
</repository>
- <repository type='rpm-md'>
- <source path='obs://openSUSE.org:openSUSE:12.3:Update/standard'/>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
</repository>
<!-- disable external kiwi -->
- <repository type='rpm-md'>
- <source path='obs://virtualization:Appliances/openSUSE_12.3/'/>
+ <repository type="rpm-md">
+ <source path="obs://virtualization:Appliances/openSUSE_12.3/"/>
</repository>
<!-- end disable -->
|
|
[-]
[+]
|
Changed |
mini-image.users
^
|
| @@ -1,7 +1,7 @@
- <users group='root'>
- <!-- schemaversion 5.3
- <user name='root' pwd='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
+ <users group="root">
+ <!-- schemaversion 5.3 -->
+ <user name="root" pwd="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
+ <!-- schemaversion 5.6
+ <user name="root" password="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
-->
- <!-- schemaversion 5.6 -->
- <user name='root' password='linux' pwdformat='plain' home='/root' shell='/bin/bash'/>
</users>
|
