|
[-]
[+]
|
Changed |
gen_kiwi_configs.sh
|
| @@ -5,6 +5,6 @@
for PROFILE in ${PROFILES} ; do
- cat ${IMG}.head ${IMG}.pref-${PROFILE} ${IMG}.users ${IMG}.packages ${IMG}.repos ${IMG}.foot > ${IMG}-${PROFILE}.kiwi
+ cat ${IMG}.head ${IMG}.pref-${PROFILE} ${IMG}.pref-main ${IMG}.users ${IMG}.repos ${IMG}.packages ${IMG}.foot > ${IMG}-${PROFILE}.kiwi
done
|
|
[-]
[+]
|
Changed |
mini-image-iso.kiwi
^
|
| @@ -12,6 +12,14 @@
<profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
+
+ <!-- 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
+ -->
<version>0.0.1</version>
<packagemanager>zypper</packagemanager>
<rpm-check-signatures>false</rpm-check-signatures>
@@ -20,8 +28,6 @@
<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" />
</preferences>
<users group="root">
@@ -32,6 +38,13 @@
-->
</users>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
+ </repository>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
+ </repository>
+
<packages type="image" patternType="onlyRequired">
<!-- not available in 12.3rc1
<package name="systemd-presets-branding-basedonopensuse"/>
@@ -89,11 +102,4 @@
<package name="postfix"/>
</packages>
- <repository type="rpm-md">
- <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
- </repository>
- <repository type="rpm-md">
- <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
- </repository>
-
</image>
|
|
[-]
[+]
|
Changed |
mini-image-net.kiwi
^
|
| @@ -12,6 +12,14 @@
<profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
+
+ <!-- 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
+ -->
<version>0.0.1</version>
<packagemanager>zypper</packagemanager>
<rpm-check-signatures>false</rpm-check-signatures>
@@ -20,8 +28,6 @@
<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"/>
</preferences>
<users group="root">
@@ -32,6 +38,13 @@
-->
</users>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
+ </repository>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
+ </repository>
+
<packages type="image" patternType="onlyRequired">
<!-- not available in 12.3rc1
<package name="systemd-presets-branding-basedonopensuse"/>
@@ -89,11 +102,4 @@
<package name="postfix"/>
</packages>
- <repository type="rpm-md">
- <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
- </repository>
- <repository type="rpm-md">
- <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
- </repository>
-
</image>
|
|
[-]
[+]
|
Changed |
mini-image-usb.kiwi
^
|
| @@ -12,6 +12,20 @@
<profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
+
+ <!-- usb image -->
+ <type boot="oemboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" bootloader="grub2" image="oem" bootprofile="std" bootkernel="default" kernelcmdline="nomodeset">
+ <oemconfig>
+ <oem-swap>true</oem-swap>
+ <oem-swapsize>512</oem-swapsize>
+ <oem-boot-title>mini-image 12.3</oem-boot-title>
+ <oem-systemsize>2048</oem-systemsize>
+ </oemconfig>
+ </type>
+
+ <!-- empty
+ just to convince diff3 on version updates
+ -->
<version>0.0.1</version>
<packagemanager>zypper</packagemanager>
<rpm-check-signatures>false</rpm-check-signatures>
@@ -20,18 +34,6 @@
<hwclock>localtime</hwclock>
<locale>en_US</locale>
<boot-theme>none</boot-theme>
- <!-- usb image -->
- <type boot="oemboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" bootloader="grub2" image="oem" bootprofile="std" bootkernel="default" kernelcmdline="nomodeset">
- <oemconfig>
- <oem-swap>true</oem-swap>
- <oem-swapsize>512</oem-swapsize>
- <oem-boot-title>mini-image 12.3</oem-boot-title>
- <oem-systemsize>2048</oem-systemsize>
- </oemconfig>
- </type>
- <!-- empty
- just to convince diff3 on version updates
- -->
</preferences>
<users group="root">
@@ -42,6 +44,13 @@
-->
</users>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
+ </repository>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
+ </repository>
+
<packages type="image" patternType="onlyRequired">
<!-- not available in 12.3rc1
<package name="systemd-presets-branding-basedonopensuse"/>
@@ -99,11 +108,4 @@
<package name="postfix"/>
</packages>
- <repository type="rpm-md">
- <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
- </repository>
- <repository type="rpm-md">
- <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
- </repository>
-
</image>
|
|
[-]
[+]
|
Changed |
mini-image-vmx.kiwi
^
|
| @@ -12,14 +12,7 @@
<profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
- <version>0.0.1</version>
- <packagemanager>zypper</packagemanager>
- <rpm-check-signatures>false</rpm-check-signatures>
- <rpm-force>false</rpm-force>
- <timezone>Europe/Berlin</timezone>
- <hwclock>localtime</hwclock>
- <locale>en_US</locale>
- <boot-theme>none</boot-theme>
+
<!-- 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">
@@ -33,6 +26,19 @@
-->
</preferences>
+ <!-- empty
+ just to convince diff3 on version updates
+ -->
+ <version>0.0.1</version>
+ <packagemanager>zypper</packagemanager>
+ <rpm-check-signatures>false</rpm-check-signatures>
+ <rpm-force>false</rpm-force>
+ <timezone>Europe/Berlin</timezone>
+ <hwclock>localtime</hwclock>
+ <locale>en_US</locale>
+ <boot-theme>none</boot-theme>
+ </preferences>
+
<users group="root">
<!-- schemaversion 5.3 -->
<user name="root" pwd="linux" pwdformat="plain" home="/root" shell="/bin/bash"/>
@@ -41,6 +47,13 @@
-->
</users>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
+ </repository>
+ <repository type="rpm-md">
+ <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
+ </repository>
+
<packages type="image" patternType="onlyRequired">
<!-- not available in 12.3rc1
<package name="systemd-presets-branding-basedonopensuse"/>
@@ -98,11 +111,4 @@
<package name="postfix"/>
</packages>
- <repository type="rpm-md">
- <source path="obs://openSUSE.org:openSUSE:12.3:Update/standard"/>
- </repository>
- <repository type="rpm-md">
- <source path="obs://openSUSE.org:openSUSE:12.3/standard"/>
- </repository>
-
</image>
|
|
[-]
[+]
|
Changed |
mini-image.head
^
|
| @@ -12,11 +12,4 @@
<profile name="vmx" description="VMWare Image" />
</profiles>
<preferences>
- <version>0.0.1</version>
- <packagemanager>zypper</packagemanager>
- <rpm-check-signatures>false</rpm-check-signatures>
- <rpm-force>false</rpm-force>
- <timezone>Europe/Berlin</timezone>
- <hwclock>localtime</hwclock>
- <locale>en_US</locale>
- <boot-theme>none</boot-theme>
+
|
|
[-]
[+]
|
Changed |
mini-image.pref-usb
^
|
| @@ -1,14 +1,10 @@
<!-- usb image -->
<type boot="oemboot/suse-12.3" fsnocheck="true" filesystem="ext4" compressed="true" bootloader="grub2" image="oem" bootprofile="std" bootkernel="default" kernelcmdline="nomodeset">
- <oemconfig>
+ <oemconfig>
<oem-swap>true</oem-swap>
<oem-swapsize>512</oem-swapsize>
<oem-boot-title>mini-image 12.3</oem-boot-title>
- <oem-systemsize>2048</oem-systemsize>
- </oemconfig>
+ <oem-systemsize>2048</oem-systemsize>
+ </oemconfig>
</type>
- <!-- empty
- just to convince diff3 on version updates
- -->
- </preferences>
|
