diff --git a/kiwi/boot/arch/x86_64/netboot/suse-13.2/config.sh b/kiwi/boot/arch/arm/oemboot/suse-leap42.3/config.sh similarity index 100% rename from kiwi/boot/arch/x86_64/netboot/suse-13.2/config.sh rename to kiwi/boot/arch/arm/oemboot/suse-leap42.3/config.sh diff --git a/kiwi/boot/arch/arm/oemboot/suse-leap42.3/config.xml b/kiwi/boot/arch/arm/oemboot/suse-leap42.3/config.xml new file mode 100644 index 00000000..5a627f1e --- /dev/null +++ b/kiwi/boot/arch/arm/oemboot/suse-leap42.3/config.xml @@ -0,0 +1,162 @@ + + + + + Marcus Schaefer + ms@novell.com + boot/initrd image used on OEM VMX disk + + + + 2.42.3 + zypper + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kiwi/boot/arch/x86_64/isoboot/suse-13.2/images.sh b/kiwi/boot/arch/arm/oemboot/suse-leap42.3/images.sh similarity index 100% rename from kiwi/boot/arch/x86_64/isoboot/suse-13.2/images.sh rename to kiwi/boot/arch/arm/oemboot/suse-leap42.3/images.sh diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/dump b/kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/dump similarity index 100% rename from kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/dump rename to kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/dump diff --git a/kiwi/boot/arch/x86_64/isoboot/suse-13.2/root/include b/kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/include similarity index 100% rename from kiwi/boot/arch/x86_64/isoboot/suse-13.2/root/include rename to kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/include diff --git a/kiwi/boot/arch/x86_64/isoboot/suse-13.2/root/linuxrc b/kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/linuxrc similarity index 100% rename from kiwi/boot/arch/x86_64/isoboot/suse-13.2/root/linuxrc rename to kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/linuxrc diff --git a/kiwi/boot/arch/x86_64/isoboot/suse-13.2/root/preinit b/kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/preinit similarity index 100% rename from kiwi/boot/arch/x86_64/isoboot/suse-13.2/root/preinit rename to kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/preinit diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/repart b/kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/repart similarity index 100% rename from kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/repart rename to kiwi/boot/arch/arm/oemboot/suse-leap42.3/root/repart diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/config.sh b/kiwi/boot/arch/arm/vmxboot/suse-leap42.3/config.sh similarity index 100% rename from kiwi/boot/arch/x86_64/oemboot/suse-13.2/config.sh rename to kiwi/boot/arch/arm/vmxboot/suse-leap42.3/config.sh diff --git a/kiwi/boot/arch/arm/vmxboot/suse-leap42.3/config.xml b/kiwi/boot/arch/arm/vmxboot/suse-leap42.3/config.xml new file mode 100644 index 00000000..236c7e83 --- /dev/null +++ b/kiwi/boot/arch/arm/vmxboot/suse-leap42.3/config.xml @@ -0,0 +1,136 @@ + + + + + Marcus Schaefer + ms@suse.com + boot/initrd image for virtual machines + + + + 2.42.3 + zypper + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/images.sh b/kiwi/boot/arch/arm/vmxboot/suse-leap42.3/images.sh similarity index 100% rename from kiwi/boot/arch/x86_64/oemboot/suse-13.2/images.sh rename to kiwi/boot/arch/arm/vmxboot/suse-leap42.3/images.sh diff --git a/kiwi/boot/arch/x86_64/netboot/suse-13.2/root/include b/kiwi/boot/arch/arm/vmxboot/suse-leap42.3/root/include similarity index 100% rename from kiwi/boot/arch/x86_64/netboot/suse-13.2/root/include rename to kiwi/boot/arch/arm/vmxboot/suse-leap42.3/root/include diff --git a/kiwi/boot/arch/x86_64/netboot/suse-13.2/root/linuxrc b/kiwi/boot/arch/arm/vmxboot/suse-leap42.3/root/linuxrc similarity index 100% rename from kiwi/boot/arch/x86_64/netboot/suse-13.2/root/linuxrc rename to kiwi/boot/arch/arm/vmxboot/suse-leap42.3/root/linuxrc diff --git a/kiwi/boot/arch/x86_64/netboot/suse-13.2/root/preinit b/kiwi/boot/arch/arm/vmxboot/suse-leap42.3/root/preinit similarity index 100% rename from kiwi/boot/arch/x86_64/netboot/suse-13.2/root/preinit rename to kiwi/boot/arch/arm/vmxboot/suse-leap42.3/root/preinit diff --git a/kiwi/boot/arch/x86_64/isoboot/suse-13.2/config.sh b/kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/config.sh similarity index 100% rename from kiwi/boot/arch/x86_64/isoboot/suse-13.2/config.sh rename to kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/config.sh diff --git a/kiwi/boot/arch/x86_64/isoboot/suse-13.2/config.xml b/kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/config.xml similarity index 82% rename from kiwi/boot/arch/x86_64/isoboot/suse-13.2/config.xml rename to kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/config.xml index f7aab118..eec7bf00 100644 --- a/kiwi/boot/arch/x86_64/isoboot/suse-13.2/config.xml +++ b/kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/config.xml @@ -1,24 +1,21 @@ - + Marcus Schaefer - ms@novell.com + ms@suse.com boot/initrd image used for LiveDVD media - 2.1.2 + 2.42.3 zypper false - - - @@ -74,29 +71,14 @@ - - - - + - - - - - - - - - - - - - + @@ -119,11 +101,9 @@ - - - + - + diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-13.2/images.sh b/kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/images.sh similarity index 100% rename from kiwi/boot/arch/x86_64/vmxboot/suse-13.2/images.sh rename to kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/images.sh diff --git a/kiwi/boot/arch/x86_64/isoboot/suse-13.2/root/etc/modprobe.d/99-local.conf b/kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/root/etc/modprobe.d/99-local.conf similarity index 100% rename from kiwi/boot/arch/x86_64/isoboot/suse-13.2/root/etc/modprobe.d/99-local.conf rename to kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/root/etc/modprobe.d/99-local.conf diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/include b/kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/root/include similarity index 100% rename from kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/include rename to kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/root/include diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/linuxrc b/kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/root/linuxrc similarity index 100% rename from kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/linuxrc rename to kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/root/linuxrc diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/preinit b/kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/root/preinit similarity index 100% rename from kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/preinit rename to kiwi/boot/arch/x86_64/isoboot/suse-leap42.3/root/preinit diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-13.2/config.sh b/kiwi/boot/arch/x86_64/netboot/suse-leap42.3/config.sh similarity index 100% rename from kiwi/boot/arch/x86_64/vmxboot/suse-13.2/config.sh rename to kiwi/boot/arch/x86_64/netboot/suse-leap42.3/config.sh diff --git a/kiwi/boot/arch/x86_64/netboot/suse-13.2/config.xml b/kiwi/boot/arch/x86_64/netboot/suse-leap42.3/config.xml similarity index 85% rename from kiwi/boot/arch/x86_64/netboot/suse-13.2/config.xml rename to kiwi/boot/arch/x86_64/netboot/suse-leap42.3/config.xml index 775f9cf2..231dcfce 100644 --- a/kiwi/boot/arch/x86_64/netboot/suse-13.2/config.xml +++ b/kiwi/boot/arch/x86_64/netboot/suse-leap42.3/config.xml @@ -1,31 +1,25 @@ - + Marcus Schaefer - ms@novell.com + ms@suse.com boot/initrd image used for PXE - 2.1.1 + 2.42.3 zypper false - - - - - - - + @@ -114,29 +108,15 @@ - + - - - - - - - - - - - + - - - - - + @@ -194,8 +174,9 @@ + - + diff --git a/kiwi/boot/arch/x86_64/netboot/suse-13.2/images.sh b/kiwi/boot/arch/x86_64/netboot/suse-leap42.3/images.sh similarity index 100% rename from kiwi/boot/arch/x86_64/netboot/suse-13.2/images.sh rename to kiwi/boot/arch/x86_64/netboot/suse-leap42.3/images.sh diff --git a/kiwi/boot/arch/x86_64/netboot/suse-13.2/root/etc/modprobe.d/99-local.conf b/kiwi/boot/arch/x86_64/netboot/suse-leap42.3/root/etc/modprobe.d/99-local.conf similarity index 100% rename from kiwi/boot/arch/x86_64/netboot/suse-13.2/root/etc/modprobe.d/99-local.conf rename to kiwi/boot/arch/x86_64/netboot/suse-leap42.3/root/etc/modprobe.d/99-local.conf diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-13.2/root/include b/kiwi/boot/arch/x86_64/netboot/suse-leap42.3/root/include similarity index 100% rename from kiwi/boot/arch/x86_64/vmxboot/suse-13.2/root/include rename to kiwi/boot/arch/x86_64/netboot/suse-leap42.3/root/include diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-13.2/root/linuxrc b/kiwi/boot/arch/x86_64/netboot/suse-leap42.3/root/linuxrc similarity index 100% rename from kiwi/boot/arch/x86_64/vmxboot/suse-13.2/root/linuxrc rename to kiwi/boot/arch/x86_64/netboot/suse-leap42.3/root/linuxrc diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-13.2/root/preinit b/kiwi/boot/arch/x86_64/netboot/suse-leap42.3/root/preinit similarity index 100% rename from kiwi/boot/arch/x86_64/vmxboot/suse-13.2/root/preinit rename to kiwi/boot/arch/x86_64/netboot/suse-leap42.3/root/preinit diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/wmrc b/kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/wmrc deleted file mode 100644 index 12267347..00000000 --- a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/root/wmrc +++ /dev/null @@ -1,113 +0,0 @@ -# IceWM configuration file for use during installation - -# Hide taskbar -ShowTaskBar=0 - -# Hide titlebar buttons -TitleButtonsLeft="" -TitleButtonsRight="" - -# Show only Move, Size and Close in the window menu -WinMenuItems="msc" - -# Enable Alt+Tab -QuickSwitch=1 -KeySysSwitchNext="Alt+Tab" -KeySysSwitchLast="Alt+Shift+Tab" - -# Colors -ColorActiveTitleBar="rgb:4e/6f/9f" -ColorNormalTitleBar="rgb:c3/c3/c3" - -# Borders -BorderSizeX=3 -BorderSizeY=3 -DlgBorderSizeX=3 -DlgBorderSizeY=3 - -# Disable most shortcuts -# :r !grep -o '\ +# : +# BELONGS TO : Operating System images +# : +# DESCRIPTION : configuration script for SUSE based +# : operating systems +# : +# : +# STATUS : BETA +#---------------- +#====================================== +# Functions... +#-------------------------------------- +test -f /.kconfig && . /.kconfig +test -f /.profile && . /.profile + +#====================================== +# Greeting... +#-------------------------------------- +echo "Configure image: [$kiwi_iname]..." + +#====================================== +# SuSEconfig +#-------------------------------------- +suseConfig + +#========================================== +# setup gfxboot +#------------------------------------------ +suseGFXBoot openSUSE grub + +#====================================== +# Keep UTF-8 locale +#-------------------------------------- +baseStripLocales \ + $(for i in $(echo $kiwi_language | tr "," " ");do echo -n "$i.utf8 ";done) +baseStripTranslations kiwi.mo + +#====================================== +# Umount kernel filesystems +#-------------------------------------- +baseCleanMount + +exit 0 diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/config.xml b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/config.xml similarity index 81% rename from kiwi/boot/arch/x86_64/oemboot/suse-13.2/config.xml rename to kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/config.xml index 7753c539..45686320 100644 --- a/kiwi/boot/arch/x86_64/oemboot/suse-13.2/config.xml +++ b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/config.xml @@ -1,14 +1,14 @@ - + Marcus Schaefer - ms@novell.com + ms@suse.com boot/initrd image used on OEM VMX disk - 2.7.1 + 2.42.3 zypper false @@ -18,9 +18,6 @@ - - - @@ -82,35 +79,17 @@ - - - - + - - - - - - - - - - - - - - - - + - + @@ -136,11 +115,9 @@ - - - + - + @@ -178,9 +155,10 @@ + + - diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/images.sh b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/images.sh new file mode 100755 index 00000000..993a04c9 --- /dev/null +++ b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/images.sh @@ -0,0 +1,27 @@ +#!/bin/sh +test -f /.kconfig && . /.kconfig +test -f /.profile && . /.profile + +echo "Configure image: [$kiwi_iname]..." + +#========================================== +# setup build day +#------------------------------------------ +baseSetupBuildDay + +#========================================== +# remove unneded kernel files +#------------------------------------------ +suseStripKernel + +#========================================== +# remove unneeded files +#------------------------------------------ +suseStripInitrd + +#========================================== +# umount +#------------------------------------------ +baseCleanMount + +exit 0 diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/dump b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/dump new file mode 120000 index 00000000..00f2bc9c --- /dev/null +++ b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/dump @@ -0,0 +1 @@ +../../dump \ No newline at end of file diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/include b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/include new file mode 120000 index 00000000..d3d30917 --- /dev/null +++ b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/include @@ -0,0 +1 @@ +../../../../../functions.sh \ No newline at end of file diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/linuxrc b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/linuxrc new file mode 120000 index 00000000..6f58ac32 --- /dev/null +++ b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/linuxrc @@ -0,0 +1 @@ +../../linuxrc \ No newline at end of file diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/preinit b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/preinit new file mode 120000 index 00000000..318e40c6 --- /dev/null +++ b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/preinit @@ -0,0 +1 @@ +../../preinit \ No newline at end of file diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/repart b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/repart new file mode 120000 index 00000000..2f60a8bd --- /dev/null +++ b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/root/repart @@ -0,0 +1 @@ +../../repart \ No newline at end of file diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/config.sh b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/config.sh new file mode 100755 index 00000000..25c66391 --- /dev/null +++ b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/config.sh @@ -0,0 +1,51 @@ +#!/bin/bash +#================ +# FILE : config.sh +#---------------- +# PROJECT : openSUSE KIWI Image System +# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved +# : +# AUTHOR : Marcus Schaefer +# : +# BELONGS TO : Operating System images +# : +# DESCRIPTION : configuration script for SUSE based +# : operating systems +# : +# : +# STATUS : BETA +#---------------- +#====================================== +# Functions... +#-------------------------------------- +test -f /.kconfig && . /.kconfig +test -f /.profile && . /.profile + +#====================================== +# Greeting... +#-------------------------------------- +echo "Configure image: [$kiwi_iname]..." + +#====================================== +# SuSEconfig +#-------------------------------------- +suseConfig + +#========================================== +# setup gfxboot +#------------------------------------------ +suseGFXBoot openSUSE grub + +#====================================== +# Keep UTF-8 locale +#-------------------------------------- +baseStripLocales \ + $(for i in $(echo $kiwi_language | tr "," " ");do echo -n "$i.utf8 ";done) +baseStripTranslations kiwi.mo + +#====================================== +# Umount kernel filesystems +#-------------------------------------- +baseCleanMount + +exit 0 diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-13.2/config.xml b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/config.xml similarity index 80% rename from kiwi/boot/arch/x86_64/vmxboot/suse-13.2/config.xml rename to kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/config.xml index fc9daea8..3e1c810c 100644 --- a/kiwi/boot/arch/x86_64/vmxboot/suse-13.2/config.xml +++ b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/config.xml @@ -1,14 +1,14 @@ - + Marcus Schaefer - ms@novell.com + ms@suse.com boot/initrd image for virtual machines - 2.7.1 + 2.42.3 zypper false @@ -18,9 +18,6 @@ - - - @@ -71,33 +68,23 @@ + + + + + - + - - - - - - - - - - - - - - - - + - + @@ -113,11 +100,9 @@ - - - + - + @@ -150,7 +135,6 @@ - diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/images.sh b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/images.sh new file mode 100755 index 00000000..993a04c9 --- /dev/null +++ b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/images.sh @@ -0,0 +1,27 @@ +#!/bin/sh +test -f /.kconfig && . /.kconfig +test -f /.profile && . /.profile + +echo "Configure image: [$kiwi_iname]..." + +#========================================== +# setup build day +#------------------------------------------ +baseSetupBuildDay + +#========================================== +# remove unneded kernel files +#------------------------------------------ +suseStripKernel + +#========================================== +# remove unneeded files +#------------------------------------------ +suseStripInitrd + +#========================================== +# umount +#------------------------------------------ +baseCleanMount + +exit 0 diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/root/include b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/root/include new file mode 120000 index 00000000..d3d30917 --- /dev/null +++ b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/root/include @@ -0,0 +1 @@ +../../../../../functions.sh \ No newline at end of file diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/root/linuxrc b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/root/linuxrc new file mode 120000 index 00000000..6f58ac32 --- /dev/null +++ b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/root/linuxrc @@ -0,0 +1 @@ +../../linuxrc \ No newline at end of file diff --git a/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/root/preinit b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/root/preinit new file mode 120000 index 00000000..318e40c6 --- /dev/null +++ b/kiwi/boot/arch/x86_64/vmxboot/suse-leap42.3/root/preinit @@ -0,0 +1 @@ +../../preinit \ No newline at end of file