Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2016-01-05 09:39:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2015-12-03
13:26:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2016-01-05
09:40:35.000000000 +0100
@@ -1,0 +2,367 @@
+Wed Dec 23 10:46:28 CET 2015 - m...@suse.de
+
+- v7.03.48 released
+
+-------------------------------------------------------------------
+Wed Dec 23 10:39:31 CET 2015 - m...@suse.de
+
+- Fixed import of kernel parameters including spaces
+
+ Kernel parameters like PRODUCT_TYPE=âPRODUCT BANANAâ breaks
+ the code in includeKernelParameters. This patch allows spaces
+ for values in a way that it replaces the embedded whitespace
+ with \030 before parsing and then reverting after parsing.
+ Thanks to Jay Nitikman for providing the patch
+
+-------------------------------------------------------------------
+Wed Dec 23 10:35:02 CET 2015 - m...@suse.de
+
+- Fixed uninstall target for buildroot use case
+
+-------------------------------------------------------------------
+Wed Dec 23 10:29:11 CET 2015 - m...@suse.de
+
+- v7.03.47 released
+
+-------------------------------------------------------------------
+Wed Dec 23 10:27:13 CET 2015 - m...@suse.de
+
+- Fixed LUKS setup for dracut
+
+ The system image has to provide /etc/crypttab to allow dracut
+ to create a working initrd for reboot. In addition the name
+ of the luks map must be 'luks' to make dracut happy.
+
+-------------------------------------------------------------------
+Wed Dec 23 10:14:45 CET 2015 - m...@suse.de
+
+- Fixed installation of documentation
+
+-------------------------------------------------------------------
+Wed Dec 23 10:02:58 CET 2015 - m...@suse.de
+
+- Update documentation
+
+ Also put each doc target into its own directory
+
+-------------------------------------------------------------------
+Wed Dec 23 09:34:48 CET 2015 - m...@suse.de
+
+- Delete binary picture data
+
+-------------------------------------------------------------------
+Wed Dec 23 09:31:36 CET 2015 - m...@suse.de
+
+- Delete unmaintained documentation sources
+
+-------------------------------------------------------------------
+Tue Dec 22 22:46:59 CET 2015 - f...@suse.de
+
+- Stylecheck
+
+-------------------------------------------------------------------
+Tue Dec 22 16:08:02 CET 2015 - f...@suse.de
+
+- Specllchecked
+
+-------------------------------------------------------------------
+Tue Dec 22 14:51:55 CET 2015 - f...@suse.de
+
+- Kiwi Doc Revision Pt. 13: Appliance and Migration
+
+-------------------------------------------------------------------
+Tue Dec 22 11:34:13 CET 2015 - f...@suse.de
+
+- Kiwi Doc Revision Pt. 12: XEN chapter
+
+-------------------------------------------------------------------
+Tue Dec 22 01:08:32 CET 2015 - afaer...@suse.de
+
+- Handle /boot/vc files for Raspberry Pi
+
+ openSUSE Tumbleweed raspberrypi-firmware[-branding-openSUSE] packages
+ have been updated to install files to /boot/vc rather than /boot.
+
+ Ensure that all files in /boot/vc find their way into the vboot partition
+ and on the boot partition prepare vc as potential mount point.
+
+ Signed-off-by: Andreas Färber <afaer...@suse.de>
+
+-------------------------------------------------------------------
+Mon Dec 21 17:30:24 CET 2015 - f...@suse.de
+
+- Kiwi Doc Revision Pt. 11: OEM chapter
+
+-------------------------------------------------------------------
+Mon Dec 21 17:29:38 CET 2015 - f...@suse.de
+
+- Kiwi Doc Revision Pt. 10 (final): PXE chapter
+
+-------------------------------------------------------------------
+Mon Dec 21 16:13:14 CET 2015 - m...@suse.de
+
+- Fixed JeOS templates configured for efi boot
+
+ in case of efi the efi modules should be installed to the system.
+ Even though it's not a problem for kiwi because it takes the modules
+ from the self build initrd it could become a problem when grub2
+ is used for reconfiguration on the system later. It is also
+ questionable whether it is a good idea from kiwi to install
+ the efi modules as part of the initrd just for the purpose to
+ take them from there at build time when they are not really needed
+ in the initrd at boot time. The new (next generation) kiwi version
+ will lookup modules from the system if possible and will not
+ keep them inside of the initrd
+
+-------------------------------------------------------------------
+Mon Dec 21 12:19:45 CET 2015 - m...@suse.de
+
+- Fixed suse-SLE12-community-JeOS description
+
+ kernel-debug is not installed, no need to have it in the
+ delete section
+
+-------------------------------------------------------------------
+Sat Dec 19 18:56:13 CET 2015 - martin.koeg...@suse.de
+
+- Honor RW filesystem type
+
+-------------------------------------------------------------------
+Sat Dec 19 18:13:43 CET 2015 - martin.koeg...@suse.de
+
+- Refactor file system check
+
+-------------------------------------------------------------------
+Thu Dec 17 09:41:32 CET 2015 - m...@suse.de
+
+- v7.03.46 released
+
+-------------------------------------------------------------------
+Thu Dec 17 09:40:10 CET 2015 - m...@suse.de
+
+- Update manual page info about targetdevice option
+
+ This is related to (bnc#956484)
+
+-------------------------------------------------------------------
+Thu Dec 17 09:35:59 CET 2015 - m...@suse.de
+
+- use sudo for kiwi when running from git source
+
+-------------------------------------------------------------------
+Thu Dec 17 09:30:01 CET 2015 - m...@suse.de
+
+- Improve validation of targetDevice
+
+ If called with --targetdevice the target must be a device block
+ special and nothing else, no symlink, no other node type
+ This fixes (bnc#956484)
+
+-------------------------------------------------------------------
+Wed Dec 16 08:46:31 CET 2015 - martin.koeg...@suse.de
+
+- Add label support for xfs
+
+-------------------------------------------------------------------
+Tue Dec 15 16:35:33 CET 2015 - m...@suse.de
+
+- v7.03.45 released
+
+-------------------------------------------------------------------
+Tue Dec 15 15:52:08 CET 2015 - m...@suse.de
+
+- Inform user if dracut is called in background mode
+
+-------------------------------------------------------------------
+Tue Dec 15 15:47:20 CET 2015 - m...@suse.de
+
+- Fixed validation of updates/weak-updates modules
+
+ suseStripKernel took the update and weak-update modules only
+ into account if they are mentioned in the drivers list. But
+ these modules are considered p1 and should always be included
+ and also checked against its dependencies
+
+-------------------------------------------------------------------
+Tue Dec 15 09:12:59 CET 2015 - martin.koeg...@suse.de
+
+- Allow xfs as hybrid RW file system
+
+-------------------------------------------------------------------
+Thu Dec 10 15:26:25 CET 2015 - m...@suse.de
+
+- v7.03.44 released
+
+-------------------------------------------------------------------
+Thu Dec 10 15:12:29 CET 2015 - m...@suse.de
+
++++ 295 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes
++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.TvTbMF/_old 2016-01-05 09:40:37.000000000 +0100
+++ /var/tmp/diff_new_pack.TvTbMF/_new 2016-01-05 09:40:37.000000000 +0100
@@ -27,7 +27,7 @@
Name: kiwi
License: GPL-2.0
Group: System/Management
-Version: 7.03.37
+Version: 7.03.48
Provides: kiwi-schema = 6.2
Provides: kiwi-image:aci
Provides: kiwi-image:lxc
@@ -93,7 +93,11 @@
Requires: tar
Requires: psmisc
Requires: util-linux
+%if 0%{?suse_version} == 1110
+Requires: sysvinit
+%else
Requires: sysvinit-tools
+%endif
%if 0%{?suse_version}
# SUSE specific requires
%if 0%{?suse_version} >= 1210
@@ -104,7 +108,7 @@
Requires: satsolver-tools
Requires: perl-satsolver >= 0.42
%endif
-%if %suse_version == 1110
+%if 0%{?suse_version} == 1110
Requires: virt-utils
%else
Requires: qemu-tools
@@ -134,52 +138,43 @@
# find out about the name scheme of the local system for
# the buildservice needed -requires packages. In terms of
# problems with this magic ask adr...@suse.de for details
+
%if 0%{?suse_version}
%define mysystems %(echo `export VER=%{suse_version}; echo
"suse-${VER:0:2}.${VER:2:1}"`)
# redefine for the SLES case if no sles_version exists
# SLE12:
-%if %suse_version == 1315 && !0%{?is_opensuse}
-%define mysystems suse-SLES12
-%endif
-# SLE12-SP1:
-%if %suse_version == 1316 && !0%{?is_opensuse}
+%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
%define mysystems suse-SLES12
%endif
# Leap 42.1:
-%if %suse_version == 1315 && 0%{?is_opensuse}
+%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
%define mysystems suse-leap42.1
%endif
# Tumbleweed:
# Current Tumbleweed version, moving target
-%if %suse_version == 1330
+%if 0%{?suse_version} == 1330
%define mysystems suse-tumbleweed
%endif
# redefine for the SLE11 case if no sles_version exists
# SLE11: NOTE: this works only because openSUSE 11.1 is out of scope
-%if %suse_version == 1110
+%if 0%{?suse_version} == 1110
%define mysystems suse-SLES11
%endif
%endif
+
# SLES with sles_version macro
%if 0%{?sles_version}
-%ifarch %ix86 x86_64
-%define mysystems suse-SLES%{sles_version}
-%else
%define mysystems suse-SLES%{sles_version}
%endif
-%endif
-# RHEL
-%if 0%{?rhel_version} == 600
+
+# RHEL // CentOS
+# use the rhel templates for CentOS, too
+%if 0%{?rhel_version} == 600 || 0%{?centos_version} == 600
%define mysystems rhel-06.0
%endif
-%if 0%{?rhel_version} == 700
+%if 0%{?rhel_version} == 700 || 0%{?centos_version} == 700
%define mysystems rhel-07.0
%endif
-# CentOS
-%if 0%{?centos_version} == 600
-# use the rhel templates for CentOS 6
-%define mysystems rhel-06.0
-%endif
# find out about my arch name, could be done also via symlinks
%define myarch %{_target_cpu}
@@ -211,18 +206,20 @@
Provides: kiwi-filesystem:ext3
Provides: kiwi-filesystem:ext4
Provides: kiwi-filesystem:squashfs
-Provides: kiwi-packagemanager:zypper
Provides: kiwi-image:docker
Requires: btrfsprogs
Requires: e2fsprogs
Requires: kiwi = %{version}
-Requires: zypper
License: GPL-2.0
Group: System/Management
%if 0%{?rhel_version} || 0%{?centos_version}
+Provides: kiwi-packagemanager:yum
+Requires: yum
Requires: squashfs-tools
%endif
%if 0%{?suse_version}
+Provides: kiwi-packagemanager:zypper
+Requires: zypper
Requires: squashfs
%endif
%if 0%{?suse_version} > 1120
@@ -371,7 +368,8 @@
Requires: s390-tools
%endif
%ifarch %ix86 x86_64
-%if 0%{?suse_version} < 1315
+# rhel7 has no grub, only grub2
+%if 0%{?suse_version} < 1315 && 0%{?rhel_version} < 700 && 0%{?centos_version}
< 700
Requires: grub
%endif
%endif
@@ -405,7 +403,7 @@
%endif
%ifarch %ix86 x86_64
Requires: syslinux
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 ||
0%{?centos_version} >= 700
Requires: grub2
%else
Requires: grub
@@ -443,10 +441,10 @@
Requires: s390-tools
%endif
%ifarch %ix86 x86_64
-%if 0%{?suse_version} < 1315
+%if 0%{?suse_version} < 1315 && 0%{?rhel_version} < 700 && 0%{?centos_version}
< 700
Requires: grub
%endif
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 ||
0%{?centos_version} >= 700
Requires: grub2
%ifarch x86_64
Requires: grub2-x86_64-efi
@@ -519,7 +517,7 @@
%endif
%ifarch %ix86 x86_64
Requires: syslinux
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 ||
0%{?centos_version} >= 700
Requires: grub2
%else
Requires: grub
@@ -560,10 +558,10 @@
Requires: s390-tools
%endif
%ifarch %ix86 x86_64
-%if 0%{?suse_version} < 1315
+%if 0%{?suse_version} < 1315 && 0%{?rhel_version} < 700 && 0%{?centos_version}
< 700
Requires: grub
%endif
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 ||
0%{?centos_version} >= 700
Requires: grub2
%ifarch x86_64
Requires: grub2-x86_64-efi
@@ -665,6 +663,7 @@
%setup -q -n %name -a2 -a3
%build
+echo "mysystems set to: %{mysystems}"
# empty because of rpmlint warning rpm-buildroot-usage
%if 0%{?suse_version} > 1140
@@ -832,10 +831,8 @@
%dir %{_defaultdocdir}/kiwi
%{_defaultdocdir}/kiwi/COPYING
%{_defaultdocdir}/kiwi/examples
-%{_defaultdocdir}/kiwi/images
-%{_defaultdocdir}/kiwi/kiwi.pdf
-%{_defaultdocdir}/kiwi/kiwi.html
-%{_defaultdocdir}/kiwi/susebooks.css
+%{_defaultdocdir}/kiwi/html
+%{_defaultdocdir}/kiwi/pdf
%{_defaultdocdir}/kiwi/schema
#=================================================
# KIWI instsource...
++++++ kiwi-docu.tar.bz2 ++++++
++++ 72626 lines of diff (skipped)
++++++ kiwi-repo.tar.bz2 ++++++
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.gitignore new/kiwi/.gitignore
--- old/kiwi/.gitignore 2015-09-21 16:23:18.000000000 +0200
+++ new/kiwi/.gitignore 2015-12-23 09:26:48.000000000 +0100
@@ -2,6 +2,8 @@
*.ts
tests/.timestamps
# emacs backup files
+\#*#
+.#*
*~
# localization files
*.mo
@@ -14,3 +16,7 @@
.revision
# d3 css data packed into a tarball
metadata/KIWIAnalyse.tgz
+# doc build specific stuff
+doc/docbook/build/
+# emacs schema definition
+doc/docbook/xml/schemas.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2015-09-14 11:57:46.000000000 +0200
+++ new/kiwi/.revision 2015-12-17 09:28:28.000000000 +0100
@@ -1 +1 @@
-75ba66ddd43a689dd5b7d1d0cc71c704b5d42344
+e7ef2da84a78034424ae14ba4e6b2ebb14592dff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile
--- old/kiwi/Makefile 2015-09-21 16:23:18.000000000 +0200
+++ new/kiwi/Makefile 2015-12-23 10:32:18.000000000 +0100
@@ -107,20 +107,22 @@
# kiwi documentation and examples
#--------------------------------------------
cp -a doc/examples/ ${PACKDOCVZ}
- cp -a doc/images/ ${PACKDOCVZ}
cp -a doc/schema/ ${PACKDOCVZ}
- cp -a doc/kiwi.pdf ${PACKDOCVZ}
- cp -a doc/kiwi.html ${PACKDOCVZ}
- cp -a doc/*.css ${PACKDOCVZ}
+ cp -a doc/pdf/ ${PACKDOCVZ}
+ cp -a doc/html/ ${PACKDOCVZ}
cp -a doc/COPYING ${PACKDOCVZ}
- test -e doc/ChangeLog && cp -a doc/ChangeLog ${PACKDOCVZ} || true
+
+ rm -rf ${PACKDOCVZ}/html/images
+ mkdir -p ${PACKDOCVZ}/html/images
+ cp -a doc/docbook/images/*.png ${PACKDOCVZ}/html/images
+ cp -a doc/docbook/images/callouts ${PACKDOCVZ}/html/images
+
rm -f ${PACKDOCVZ}/schema/Makefile
- rm -f ${PACKDOCVZ}/schema/susesync
#============================================
# kiwi manual pages
#--------------------------------------------
- for i in $(shell ls -1 ./doc/*.1);do \
+ for i in $(shell ls -1 ./doc/man/*.1);do \
install -m 644 $$i ${MANVZ} ;\
done
@@ -278,11 +280,11 @@
uninstall:
@echo Uninstalling...
- rm -rf /usr/share/kiwi
- rm -rf /usr/share/doc/packages/kiwi
- rm -f /usr/sbin/kiwi
- rm -f /usr/share/emacs/site-lisp/suse-start-kiwi-mode.el
- rm -f /etc/bash_completion.d/kiwi.sh
+ rm -rf ${buildroot}/usr/share/kiwi
+ rm -rf ${buildroot}/usr/share/doc/packages/kiwi
+ rm -f ${buildroot}/usr/sbin/kiwi
+ rm -f ${buildroot}/usr/share/emacs/site-lisp/suse-start-kiwi-mode.el
+ rm -f ${buildroot}/etc/bash_completion.d/kiwi.sh
build: clean
./.doit -p --local
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/kiwi new/kiwi/kiwi
--- old/kiwi/kiwi 2015-09-10 15:20:51.000000000 +0200
+++ new/kiwi/kiwi 2015-12-17 09:35:08.000000000 +0100
@@ -6,7 +6,7 @@
pushd $callpath &>/dev/null
if [ ! -f "metadata/KIWIAnalyse.tgz" ];then
- su $USER -c "tar -C metadata -czf metadata/KIWIAnalyse.tgz d3"
+ sudo su $USER -c "tar -C metadata -czf metadata/KIWIAnalyse.tgz d3"
fi
if [ ! -s ".revision" ];then
./.version > .revision
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2015-09-14 11:57:46.000000000 +0200
+++ new/kiwi/kiwi.pl 2015-12-17 09:28:28.000000000 +0100
@@ -1483,10 +1483,20 @@
$kiwi -> failed ();
kiwiExit (1);
}
- if (($targetDevice) && (! -b $targetDevice)) {
- $kiwi -> error ("Target device $targetDevice doesn't exist");
- $kiwi -> failed ();
- kiwiExit (1);
+ if ($targetDevice) {
+ if (! -e $targetDevice) {
+ $kiwi -> error (
+ "Target device $targetDevice doesn't exist"
+ );
+ $kiwi -> failed ();
+ kiwiExit (1);
+ } elsif ((-l $targetDevice) || (! -b $targetDevice)) {
+ $kiwi -> error (
+ "Target device $targetDevice is not a block device"
+ );
+ $kiwi -> failed ();
+ kiwiExit (1);
+ }
}
if ((defined $IgnoreRepos) && (defined $SetRepository)) {
$kiwi -> error ("Can't use ignore repos together with set repos");
@@ -2184,7 +2194,7 @@
$kiwi -> failed ();
kiwiExit (1);
}
- my $cmd = "find -L -type f | grep -v .svn | grep -v .checksum.md5";
+ my $cmd = "find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 |
sort";
my $status = KIWIQX::qxx (
"cd $idesc && $cmd | xargs md5sum > .checksum.md5"
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/locale/sv/LC_MESSAGES/kiwi.po
new/kiwi/locale/sv/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/sv/LC_MESSAGES/kiwi.po 2015-10-13 18:14:52.000000000
+0200
+++ new/kiwi/locale/sv/LC_MESSAGES/kiwi.po 2015-12-11 10:09:28.000000000
+0100
@@ -9,15 +9,15 @@
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-05-18 10:26+0200\n"
-"PO-Revision-Date: 2005-09-18 19:09+0200\n"
-"Last-Translator: Mattias Newzella <newze...@linux.se>\n"
-"Language-Team: Swedish <s...@li.org>\n"
+"PO-Revision-Date: 2015-12-06 01:08+0200\n"
+"Last-Translator: Jonas Svensson <jo...@ekhorva.se>\n"
+"Language-Team: Swedish <http://l10n.opensuse.org/projects/kiwi/master/sv/>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.3\n"
#. /.../
#. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved.
@@ -25,47 +25,42 @@
#. boot code for KIWI
#.
msgid "Boot continues in 10 sec"
-msgstr ""
+msgstr "Uppstarten fortsätter om 10 sekunder"
msgid "Enter LUKS passphrase"
-msgstr ""
+msgstr "Skriv in LUKS-lösenord"
msgid "Do you accept the license agreement ?"
-msgstr ""
+msgstr "Accepterar du licensavtalet?"
# power-off message
-#, fuzzy
msgid "Do you want to start the System-Recovery ?"
-msgstr "Vill du stänga av datorn nu?"
+msgstr "Vill du påbörja systemåterställningen?"
# power-off message
-#, fuzzy
msgid "Do you want to start the System-Restore ?"
-msgstr "Vill du stänga av datorn nu?"
+msgstr "Vill du starta systemåterställningen?"
-#, fuzzy
msgid "Restoring base operating system..."
-msgstr "Starta om och starta ett annat operativsystem"
+msgstr "Återställer grundoperativsystemet..."
msgid "Destroying ALL data on %1, continue ?"
-msgstr ""
+msgstr "ALL data på %1 kommer att förstöras. Vill du fortsätta?"
msgid "Clean sweep..."
-msgstr ""
+msgstr "Raderar..."
msgid "%1 files from %2 restored..."
-msgstr ""
+msgstr "%1 filer från %2 återställda..."
msgid "backing up: %1..."
-msgstr ""
+msgstr "säkerhetskopierar %1..."
-#, fuzzy
msgid "archiving: %1..."
-msgstr "Filen är för stor: %1."
+msgstr "arkiverar: %1."
-#, fuzzy
msgid "restoring: %1..."
-msgstr "Filen är för stor: %1."
+msgstr "återställer: %1."
msgid "Yes"
msgstr "Ja"
@@ -82,45 +77,44 @@
msgstr "Avbryt"
msgid "Exit"
-msgstr ""
+msgstr "Avsluta"
msgid "Bootloader installation has failed"
-msgstr ""
+msgstr "Installationen av bootloadern misslyckades"
msgid ""
"The system will not be able to reboot. Please make sure to fixup and install "
"the bootloader before next reboot. Check /var/log/boot.kiwi for details"
msgstr ""
+"Systemet kommer inte att kunna starta. Du måste reparera och installera "
+"bootloadern innan nästa omstart. Se /var/log/boot.kiwi för mer information"
msgid "Please remove the CD/DVD before reboot"
-msgstr ""
+msgstr "Avlägsna alla CD/DVD-skivor innan datorn startas om"
msgid "Please unplug the USB stick before reboot"
-msgstr ""
+msgstr "Avlägsna USB-stickan innan omstart"
-#, fuzzy
msgid "Installation..."
-msgstr "Installation"
+msgstr "Installation..."
-#, fuzzy
msgid "Loading %1"
-msgstr "Fel vid laddning av %1"
+msgstr "Laddar %1"
msgid "Verifying %1"
-msgstr ""
+msgstr "Verifierar %1"
# dialog title for hard disk installation
-#, fuzzy
msgid "Select disk for installation:"
-msgstr "Hårddiskinstallation"
+msgstr "Välj installationsdisk:"
# dialog title for hard disk installation
-#, fuzzy
msgid "Select %1 partition for installation:"
-msgstr "Hårddiskinstallation"
+msgstr "Välj %1 partition för installation:"
msgid "System will be shutdown. Remove USB stick before power on"
msgstr ""
+"Systemet kommer att stängas av. Avlägsna USB-stickan innan du slår på datorn"
msgid "Please remove the CD/DVD before shutdown"
-msgstr ""
+msgstr "Avlägsna CD/DVD-skivan innan du stänger av"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm
--- old/kiwi/modules/KIWIBoot.pm 2015-10-20 16:02:48.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2015-12-22 09:39:43.000000000 +0100
@@ -3894,6 +3894,7 @@
my $core= "$tmpdir/EFI/BOOT/$fo_bin";
my $core_opts;
$core_opts = "-O $fo -o $core -c $earlyboot ";
+ $core_opts.= "-p /boot/grub2 ";
$core_opts.= "-d $tmpdir/$stages{efi}{stageSRC}";
$status = KIWIQX::qxx (
"$grub2_mkimage $core_opts @modules 2>&1"
@@ -3997,6 +3998,7 @@
my $core = "$tmpdir/boot/grub2/$format/core.elf";
my $core_opts;
$core_opts = "-O $format -o $core -c $earlyboot ";
+ $core_opts.= "-p /boot/grub2 ";
$core_opts.= "-d $tmpdir/$stages{ofw}{stageSRC}";
my $status = KIWIQX::qxx (
"$grub2_mkimage $core_opts @modules 2>&1"
@@ -4028,6 +4030,7 @@
my $cdcore = "$tmpdir/boot/grub2/$format/cdboot.img";
my $core_opts;
$core_opts = "-O $format -o $core -c $earlyboot ";
+ $core_opts.= "-p /boot/grub2 ";
$core_opts.= "-d $tmpdir/$stages{bios}{stageSRC}";
my $status = KIWIQX::qxx (
"$grub2_mkimage $core_opts @modules 2>&1"
@@ -5562,7 +5565,7 @@
my $target = $dest;
KIWIQX::qxx ("mv $dest/boot/boot.scr $target &>/dev/null");
KIWIQX::qxx ("mv $dest/boot/*.dtb $target &>/dev/null");
- KIWIQX::qxx ("mv $dest/boot/dtb/ $target &>/dev/null");
+ KIWIQX::qxx ("mv $dest/boot/dtb* $target &>/dev/null");
if (-f "$dest/boot/MLO") {
$status = KIWIQX::qxx ("mv $dest/boot/MLO $target");
$result = $? >> 8;
@@ -5588,6 +5591,11 @@
KIWIQX::qxx ("mv $dest/boot/*.img $target &>/dev/null");
KIWIQX::qxx ("mv $dest/boot/*.imx $target &>/dev/null");
KIWIQX::qxx ("mv $dest/boot/*.elf $target &>/dev/null");
+ if (-d "$dest/boot/vc") {
+ # Raspberry Pi VideoCore files
+ KIWIQX::qxx ("mv $dest/boot/vc/* $target &>/dev/null");
+ KIWIQX::qxx ("mv $dest/boot/vc $dest &>/dev/null");
+ }
}
#==========================================
# YaBoot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh
new/kiwi/modules/KIWIConfig.sh
--- old/kiwi/modules/KIWIConfig.sh 2015-11-17 12:53:24.000000000 +0100
+++ new/kiwi/modules/KIWIConfig.sh 2015-12-22 09:39:43.000000000 +0100
@@ -1200,12 +1200,15 @@
if [ -f /boot/MLO ];then
mv /boot/MLO /image/loader
fi
+ if [ -d /boot/vc ];then
+ mv /boot/vc /image/loader
+ fi
mv /boot/*.dat /image/loader &>/dev/null
mv /boot/*.bin /image/loader &>/dev/null
mv /boot/*.img /image/loader &>/dev/null
mv /boot/*.imx /image/loader &>/dev/null
mv /boot/*.dtb /image/loader &>/dev/null
- mv /boot/dtb/ /image/loader &>/dev/null
+ mv /boot/dtb* /image/loader &>/dev/null
mv /boot/*.elf /image/loader &>/dev/null
else
# boot loader binaries
@@ -1474,17 +1477,22 @@
#==========================================
# check for weak-/updates and backup them
#------------------------------------------
+ stripdir=/tmp/stripped_modules
if [ -d $kversion/weak-updates ];then
- mv $kversion/weak-updates /tmp
+ mkdir -pv $stripdir$kversion
+ mv $kversion/weak-updates $stripdir$kversion
+ fi
+ if [ -d $kversion/updates ];then
+ mkdir -pv $stripdir$kversion
+ mv $kversion/updates $stripdir$kversion
fi
#==========================================
# strip the modules but take care for deps
#------------------------------------------
- stripdir=/tmp/stripped_modules
for mod in $(echo $kiwi_drivers | tr , ' '); do
- local path=`/usr/bin/dirname $mod`
- local base=`/usr/bin/basename $mod`
- for d in "." kernel updates;do
+ local path=$(/usr/bin/dirname $mod)
+ local base=$(/usr/bin/basename $mod)
+ for d in "." kernel;do
if [ "$base" = "*" ];then
if test -d $kversion/$d/$path ; then
mkdir -pv $stripdir$kversion/$d/$path
@@ -1537,9 +1545,6 @@
if [ -f /tmp/modules.order ];then
mv /tmp/modules.order $kversion
fi
- if [ -d /tmp/weak-updates ];then
- mv /tmp/weak-updates $kversion
- fi
#==========================================
# run depmod
#------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIConfigure.pm
new/kiwi/modules/KIWIConfigure.pm
--- old/kiwi/modules/KIWIConfigure.pm 2015-09-21 16:23:18.000000000 +0200
+++ new/kiwi/modules/KIWIConfigure.pm 2015-12-11 10:09:28.000000000 +0100
@@ -736,24 +736,25 @@
my $root = $this->{root};
my $xml = $this->{xml};
my $users = $xml -> getUsers();
- my $adduser = $locator -> getExecPath('useradd', $root);
my $chown = $locator -> getExecPath('chown', $root);
my $grep = $locator -> getExecPath('grep', $root);
- my $moduser = $locator -> getExecPath('usermod', $root);
my $numUsers = scalar @{$users};
- if ($numUsers) {
- if (! $adduser) {
- $kiwi -> error ("Missing useradd command");
- $kiwi -> failed ();
- return;
- }
- if (! $moduser) {
- $kiwi -> error ("Missing usermod command");
- $kiwi -> failed ();
- return;
- }
- }
+
for my $user (@{$users}) {
+ my $adduser = $locator -> getExecPath('useradd', $root);
+ my $moduser = $locator -> getExecPath('usermod', $root);
+ if ($numUsers) {
+ if (! $adduser) {
+ $kiwi -> error ("Missing useradd command");
+ $kiwi -> failed ();
+ return;
+ }
+ if (! $moduser) {
+ $kiwi -> error ("Missing usermod command");
+ $kiwi -> failed ();
+ return;
+ }
+ }
my $group = $user -> getGroupName();
my $gid = $user -> getGroupID();
my $logShell = $user -> getLoginShell();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm
new/kiwi/modules/KIWIGlobals.pm
--- old/kiwi/modules/KIWIGlobals.pm 2015-11-26 09:59:25.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2015-12-23 10:50:16.000000000 +0100
@@ -1933,7 +1933,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "7.03.37";
+ $data{Version} = "7.03.48";
$data{Publisher} = "SUSE LINUX GmbH";
$data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";;
$data{ConfigName} = "config.xml";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm
new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm 2015-10-19 16:09:59.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2015-11-30 12:44:35.000000000 +0100
@@ -2205,7 +2205,7 @@
} elsif ($gzip =~ /^seed/) {
print $CFD "UNIONFS_CONFIG='/dev/ram1,loop,seed'\n";
} elsif ($gzip =~ /^overlay/) {
- print $CFD "UNIONFS_CONFIG='/dev/ram1,loop,overlay'\n";
+ print $CFD "UNIONFS_CONFIG='tmpfs,loop,overlay'\n";
} else {
print $CFD "COMBINED_IMAGE=yes\n";
}
@@ -4194,6 +4194,11 @@
}
KIWIQX::qxx ("rm -rf $imageTree/boot/*");
}
+ else {
+ $kiwi -> warning ("--> Can't find kernel for extraction: " .
+ "did you call suseStripKernel?");
+ $kiwi -> skipped ();
+ }
return $name;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh
new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh 2015-10-19 11:50:56.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2015-12-23 10:50:16.000000000 +0100
@@ -1593,12 +1593,22 @@
#--------------------------------------
if [ -x "$dracutExec" ]; then
# 1. dracut
- Echo "Creating dracut based initrd"
params=" -f /boot/initrd-$kernel_version $kernel_version"
- if ! $dracutExec -H $params;then
- Echo "Can't create initrd with dracut"
- systemIntegrity=unknown
- bootLoaderOK=0
+ if [[ $kiwi_initrdname =~ vmxboot ]];then
+ Echo "Creating dracut based initrd (background process)"
+ # run dracut in the background to speed up the boot.
+ # We loose the status check of the call and reboot is
+ # only safe after the call has finished. Therefore this
+ # is only done for simple vmx type images which are
+ # mostly used in cloud frameworks
+ $dracutExec -H $params &>/dev/null </dev/null &
+ else
+ Echo "Creating dracut based initrd"
+ if ! $dracutExec -H $params;then
+ Echo "Can't create initrd with dracut"
+ systemIntegrity=unknown
+ bootLoaderOK=0
+ fi
fi
elif [ -x "$mkinitrdExec" ]; then
# 2. mkinitrd
@@ -1741,6 +1751,22 @@
"reboot"
esac
setupBootThemes "/config"
+ if [ "$haveLuks" = "yes" ]; then
+ setupCryptTab
+ fi
+}
+#======================================
+# setupCryptTab
+#--------------------------------------
+function setupCryptTab {
+ local IFS=$IFS_ORIG
+ local rootdevice=$(ddn $imageDiskDevice $kiwi_RootPart)
+ local fsuuid=$(blkid $rootdevice -s UUID -o value)
+ local prefix=$1
+ if [ -z "$prefix" ];then
+ prefix=/mnt
+ fi
+ echo "luks UUID=$fsuuid" > $prefix/etc/crypttab
}
#======================================
# setupBootThemes
@@ -3736,13 +3762,10 @@
#======================================
# update config file
#--------------------------------------
- for key in INITRD_MODULES DOMU_INITRD_MODULES;do
+ for key in INITRD_MODULES;do
if [ $key = "INITRD_MODULES" ];then
val=$INITRD_MODULES
fi
- if [ $key = "DOMU_INITRD_MODULES" ];then
- val=$DOMURD_MODULES
- fi
if [ -z "$val" ];then
continue
fi
@@ -6209,18 +6232,22 @@
if [ -z "$file" ];then
file=/proc/cmdline
fi
- for i in $(cat $file);do
+ local cmdline=$(
+ awk -F\" '{OFS="\"";for(i=2;i<NF;i+=2)gsub(/ /,"\030",$i);print}'
<$file
+ )
+ for i in $cmdline;do
if ! echo $i | grep -q "=";then
continue
fi
- kernelKey=`echo $i | cut -f1 -d=`
+ kernelKey=$(echo $i | cut -f1 -d=)
#======================================
# convert parameters to lowercase if required
#--------------------------------------
if [ "$translate" = "lowercase" ];then
kernelKey=`echo $kernelKey | tr [:upper:] [:lower:]`
fi
- kernelVal=`echo $i | cut -f2 -d=`
+ kernelVal=$(echo $i | cut -f2 -d=)
+ kernelVal=$(echo $kernelVal | sed -e 's/\o30/ /g')
eval export $kernelKey=$kernelVal
done
if [ ! -z "$kiwikernelmodule" ];then
@@ -6399,35 +6426,23 @@
if [ "$RELOAD_IMAGE" = "yes" ] || \
! mount -o ro $rwDevice $rwDir &>/dev/null
then
- #======================================
- # store old FSTYPE value
- #--------------------------------------
- if [ ! -z "$FSTYPE" ];then
- FSTYPE_SAVE=$FSTYPE
- fi
- #======================================
- # probe filesystem
- #--------------------------------------
- probeFileSystem $rwDevice
- if [ ! "$FSTYPE" = "unknown" ];then
- Echo "Checking filesystem for RW data on $rwDevice..."
- e2fsck -p $rwDevice
- fi
- #======================================
- # restore FSTYPE
- #--------------------------------------
- if [ ! -z "$FSTYPE_SAVE" ];then
- FSTYPE=$FSTYPE_SAVE
+ local hybrid_fs=$HYBRID_PERSISTENT_FS
+ if [ ! -z "$kiwi_hybridpersistent_filesystem" ];then
+ hybrid_fs=$kiwi_hybridpersistent_filesystem
fi
+ Echo "Checking filesystem for RW data on $rwDevice..."
+ checkFilesystem $rwDevice
+
if [ "$RELOAD_IMAGE" = "yes" ] || \
! mount -o ro $rwDevice $rwDir &>/dev/null
then
Echo "Creating filesystem for RW data on $rwDevice..."
- if ! mkfs.ext3 -F $rwDevice >/dev/null;then
+ local exception_handling="false"
+ if ! createFilesystem $rwDevice "" "" "hybrid"
$exception_handling $hybrid_fs; then
Echo "Failed to create ext3 filesystem"
return 1
fi
- e2fsck -p $rwDevice >/dev/null
+ checkFilesystem $rwDevice >/dev/null
fi
else
umount $rwDevice
@@ -8611,7 +8626,7 @@
# no map name set, build it from device
#--------------------------------------
if [ -z "$name" ];then
- name=luks_$(basename "$ldev")
+ name=luks
fi
#======================================
# luks map already exists, return
@@ -9705,6 +9720,35 @@
exec kexec -e
}
#======================================
+# checkFilesystem
+#--------------------------------------
+function checkFilesystem {
+ local device=$1
+ local FSTYPE_SAVE=$FS_TYPE
+ if [ -z "$FSTYPE" ];then
+ probeFileSystem $device
+ fi
+ if [ "$FSTYPE" = "reiserfs" ];then
+ reiserfsck -y $device
+ elif [ "$FSTYPE" = "ext2" ];then
+ e2fsck -p $device
+ elif [ "$FSTYPE" = "ext3" ];then
+ e2fsck -p $device
+ elif [ "$FSTYPE" = "ext4" ];then
+ e2fsck -p $device
+ elif [ "$FSTYPE" = "btrfs" ];then
+ btrfsck $device
+ elif [ "$FSTYPE" = "xfs" ];then
+ xfs_repair -n $device
+ else
+ FSTYPE=$FSTYPE_SAVE
+ # don't know how to check this filesystem
+ Echo "Don't know how to check ${FSTYPE}... skip it"
+ return
+ fi
+ FSTYPE=$FSTYPE_SAVE
+}
+#======================================
# resizeFilesystem
#--------------------------------------
function resizeFilesystem {
@@ -9725,22 +9769,18 @@
fi
if [ "$FSTYPE" = "reiserfs" ];then
resize_fs="resize_reiserfs -q $deviceResize"
- check="reiserfsck -y $deviceResize"
elif [ "$FSTYPE" = "ext2" ];then
resize_fs="resize2fs -f -F -p $deviceResize"
- check="e2fsck -p $deviceResize"
if [ $ramdisk -eq 1 ];then
resize_fs="resize2fs -f $deviceResize"
fi
elif [ "$FSTYPE" = "ext3" ];then
resize_fs="resize2fs -f -F -p $deviceResize"
- check="e2fsck -p $deviceResize"
if [ $ramdisk -eq 1 ];then
resize_fs="resize2fs -f $deviceResize"
fi
elif [ "$FSTYPE" = "ext4" ];then
resize_fs="resize2fs -f -F -p $deviceResize"
- check="e2fsck -p $deviceResize"
if [ $ramdisk -eq 1 ];then
resize_fs="resize2fs -f $deviceResize"
fi
@@ -9752,11 +9792,9 @@
else
resize_fs="$resize_fs btrfsctl -r max $mpoint;umount $mpoint"
fi
- check="btrfsck $deviceResize"
elif [ "$FSTYPE" = "xfs" ];then
resize_fs="mount $deviceResize $mpoint &&"
resize_fs="$resize_fs xfs_growfs $mpoint;umount $mpoint"
- check="xfs_repair -n $deviceResize"
elif [ "$FSTYPE" = "zfs" ];then
local device=$(getDiskID $deviceResize)
resize_fs="zpool import kiwipool && udevPending &&"
@@ -9768,9 +9806,9 @@
return
fi
if [ -z "$callme" ];then
- if [ $ramdisk -eq 0 ] && [ ! -z "$check" ];then
+ if [ $ramdisk -eq 0 ]; then
Echo "Checking $FSTYPE filesystem on ${deviceResize}..."
- eval $check
+ checkFilesystem $check
fi
Echo "Resizing $FSTYPE filesystem on ${deviceResize}..."
eval $resize_fs
@@ -9864,6 +9902,10 @@
if [ ! -z "$label" ];then
opts="$opts -n $label"
fi
+ elif [ "$filesystem" = "xfs" ];then
+ if [ ! -z "$label" ];then
+ opts="$opts -L $label"
+ fi
elif [ "$filesystem" = "ntfs" ];then
if [ ! -z "$label" ];then
opts="$opts -L $label"
@@ -9884,8 +9926,10 @@
dd if=/dev/zero of=$deviceCreate bs=1M count=1 conv=notrunc
mkfs.btrfs $opts $deviceCreate
elif [ "$filesystem" = "xfs" ];then
- mkfs.xfs -f $deviceCreate
- xfs_admin -U $uuid $deviceCreate
+ mkfs.xfs $opts -f $deviceCreate
+ if [ ! -z "$uuid" ];then
+ xfs_admin -U $uuid $deviceCreate
+ fi
elif [ "$filesystem" = "fat" ];then
mkfs.fat $opts $deviceCreate $blocks 1>&2
elif [ "$filesystem" = "ntfs" ];then
@@ -11449,6 +11493,7 @@
if [ ! -z "$kiwi_bootloader" ];then
export loader=$kiwi_bootloader
fi
+ export kiwi_initrdname=$kiwi_iname
fi
#======================================
# Check partitioner capabilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm
--- old/kiwi/modules/KIWIRoot.pm 2015-09-21 16:23:18.000000000 +0200
+++ new/kiwi/modules/KIWIRoot.pm 2015-12-11 10:09:28.000000000 +0100
@@ -482,6 +482,9 @@
#----------------------------------
$kiwi -> info ("Creating default template files for new root system");
if (! defined $this->{cacheRoot}) {
+ my $type = $xml -> getImageType();
+ my $boot_description = $type -> getBootImageDescript();
+
KIWIQX::qxx ("mkdir -p $root/dev");
KIWIQX::qxx ("chown root:root $root/dev");
KIWIQX::qxx ("mkdir -m 755 -p $root/proc");
@@ -505,9 +508,28 @@
KIWIQX::qxx ("mkdir -p $root/etc/sysconfig");
KIWIQX::qxx ("mkdir -m 755 -p $root/var");
KIWIQX::qxx ("chown root:root $root/var");
- KIWIQX::qxx ("mkdir -m 755 -p $root/run");
- KIWIQX::qxx ("chown root:root $root/run");
- KIWIQX::qxx ("ln -s /run $root/var/run");
+
+ # this is a bad hack to check which system var/run vs. /run structure
+ # we need. Unfortunately the suse packages does not handle this
+ # correctly because it depends on the order of the packages
+ # if the setup is correct or not. We have no influence on the order
+ # because we pass the package installation to the package manager
+ # Thus there is at the moment no other way to pro actively create
+ # filesystem structures which really should not be kiwi's task
+ # to this extend
+ if (($boot_description) && ($boot_description =~ /SLES11|rhel-06/)) {
+ KIWIQX::qxx ("mkdir -m 755 -p $root/var/run");
+ KIWIQX::qxx ("chown root:root $root/var/run");
+ KIWIQX::qxx ("mkdir -m 755 -p $root/var/run/dbus");
+ KIWIQX::qxx ("chown root:root $root/var/run/dbus");
+ } else {
+ KIWIQX::qxx ("mkdir -m 755 -p $root/run");
+ KIWIQX::qxx ("chown root:root $root/run");
+ KIWIQX::qxx ("mkdir -m 755 -p $root/run/dbus");
+ KIWIQX::qxx ("chown root:root $root/run/dbus");
+ KIWIQX::qxx ("ln -s ../run $root/var/run");
+ }
+
# for zypper we need a yast log dir
if ($packager eq "zypper") {
KIWIQX::qxx ("mkdir -p $root/var/log/YaST2");
@@ -1758,11 +1780,13 @@
$kiwi -> skipped ();
}
}
- if (($prefix) && ($item =~ /^$prefix/)) {
+ if (($prefix) && ($item =~ /^$prefix/) && ($item =~ /base-system/)) {
KIWIQX::qxx ("rmdir -p \"$item\" 2>&1");
+ } elsif (($prefix) && ($item =~ /^$prefix/)) {
+ KIWIQX::qxx ("rmdir \"$item\" 2>&1");
}
if ($item =~ /^\/tmp\/kiwimount/) {
- KIWIQX::qxx ("rmdir -p \"$item\" 2>&1");
+ KIWIQX::qxx ("rmdir \"$item\" 2>&1");
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc
new/kiwi/modules/KIWISchema.rnc
--- old/kiwi/modules/KIWISchema.rnc 2015-11-26 09:08:16.000000000 +0100
+++ new/kiwi/modules/KIWISchema.rnc 2015-12-23 09:12:14.000000000 +0100
@@ -1783,7 +1783,7 @@
## hybrid ISO is used as disk on e.g a USB Stick. By default
## the btrfs filesystem is used
attribute hybridpersistent_filesystem {
- "btrfs" | "fat" | "ext4"
+ "btrfs" | "fat" | "ext4" | "xfs"
}
k.type.image.attribute =
## Specifies the image type
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng
new/kiwi/modules/KIWISchema.rng
--- old/kiwi/modules/KIWISchema.rng 2015-11-26 09:08:25.000000000 +0100
+++ new/kiwi/modules/KIWISchema.rng 2015-12-23 09:12:14.000000000 +0100
@@ -2404,6 +2404,7 @@
<value>btrfs</value>
<value>fat</value>
<value>ext4</value>
+ <value>xfs</value>
</choice>
</attribute>
</define>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/armv7l/.md5
new/kiwi/system/boot/armv7l/.md5
--- old/kiwi/system/boot/armv7l/.md5 2015-09-10 15:20:52.000000000 +0200
+++ new/kiwi/system/boot/armv7l/.md5 2015-11-30 10:11:39.000000000 +0100
@@ -3,7 +3,7 @@
for dir in `find -type d`;do
if [ -f $dir/config.xml ];then
pushd $dir &>/dev/null
- find -L -type f | grep -v .svn | grep -v .checksum.md5 |\
+ find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\
xargs md5sum > .checksum.md5
popd &>/dev/null
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc
new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc
--- old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2015-10-08
10:34:41.000000000 +0200
+++ new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2015-12-11
10:09:28.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES=""
export LOCAL_BOOT=no
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc
new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2015-10-08
10:34:55.000000000 +0200
+++ new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2015-12-11
10:09:28.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES=""
export LOCAL_BOOT="no"
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ia64/.md5
new/kiwi/system/boot/ia64/.md5
--- old/kiwi/system/boot/ia64/.md5 2015-09-10 15:20:53.000000000 +0200
+++ new/kiwi/system/boot/ia64/.md5 2015-11-30 10:11:39.000000000 +0100
@@ -3,7 +3,7 @@
for dir in `find -type d`;do
if [ -f $dir/config.xml ];then
pushd $dir &>/dev/null
- find -L -type f | grep -v .svn | grep -v .checksum.md5 |\
+ find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\
xargs md5sum > .checksum.md5
popd &>/dev/null
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/.md5
new/kiwi/system/boot/ix86/.md5
--- old/kiwi/system/boot/ix86/.md5 2015-09-10 15:20:53.000000000 +0200
+++ new/kiwi/system/boot/ix86/.md5 2015-11-30 10:11:39.000000000 +0100
@@ -3,7 +3,7 @@
for dir in `find -type d`;do
if [ -f $dir/config.xml ];then
pushd $dir &>/dev/null
- find -L -type f | grep -v .svn | grep -v .checksum.md5 |\
+ find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\
xargs md5sum > .checksum.md5
popd &>/dev/null
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc
new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc
--- old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2015-09-22
13:06:53.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2015-11-30
15:09:37.000000000 +0100
@@ -109,7 +109,10 @@
importFile < $LIVECD_CONFIG
if [ ! -z "$HYBRID_RW" ];then
if [ ! -z "$UNIONFS_CONFIG" ];then
- UNIONFS_CONFIG=$(echo $UNIONFS_CONFIG | sed -e s@/dev/ram1@$HYBRID_RW@)
+ tmp_rwDevice=$(echo $UNIONFS_CONFIG | cut -d , -f 1)
+ UNIONFS_CONFIG=$(
+ echo $UNIONFS_CONFIG | sed -e s@$tmp_rwDevice@$HYBRID_RW@
+ )
else
IMAGE=$(echo $IMAGE | sed -e s@/dev/ram1@$HYBRID_RW@)
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-linuxrc
new/kiwi/system/boot/ix86/isoboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2015-09-22
13:07:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2015-11-30
14:58:51.000000000 +0100
@@ -109,7 +109,10 @@
importFile < $LIVECD_CONFIG
if [ ! -z "$HYBRID_RW" ];then
if [ ! -z "$UNIONFS_CONFIG" ];then
- UNIONFS_CONFIG=$(echo $UNIONFS_CONFIG | sed -e s@/dev/ram1@$HYBRID_RW@)
+ tmp_rwDevice=$(echo $UNIONFS_CONFIG | cut -d , -f 1)
+ UNIONFS_CONFIG=$(
+ echo $UNIONFS_CONFIG | sed -e s@$tmp_rwDevice@$HYBRID_RW@
+ )
else
IMAGE=$(echo $IMAGE | sed -e s@/dev/ram1@$HYBRID_RW@)
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc
new/kiwi/system/boot/ix86/netboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2015-09-10
15:20:53.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -28,7 +28,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES=""
export LOCAL_BOOT="no"
export KERNEL_LIST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc
new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc
--- old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2015-09-21
16:23:19.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES=""
export LOCAL_BOOT=no
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc
new/kiwi/system/boot/ix86/oemboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2015-10-08
10:30:50.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES=""
export LOCAL_BOOT=no
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc
new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc
--- old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2015-09-10
15:20:54.000000000 +0200
+++ new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES=""
export LOCAL_BOOT="no"
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc
new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2015-10-08
10:31:21.000000000 +0200
+++ new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES=""
export LOCAL_BOOT="no"
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/m68k/.md5
new/kiwi/system/boot/m68k/.md5
--- old/kiwi/system/boot/m68k/.md5 2015-09-10 15:20:54.000000000 +0200
+++ new/kiwi/system/boot/m68k/.md5 2015-11-30 10:11:39.000000000 +0100
@@ -3,7 +3,7 @@
for dir in `find -type d`;do
if [ -f $dir/config.xml ];then
pushd $dir &>/dev/null
- find -L -type f | grep -v .svn | grep -v .checksum.md5 |\
+ find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\
xargs md5sum > .checksum.md5
popd &>/dev/null
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/.md5
new/kiwi/system/boot/ppc/.md5
--- old/kiwi/system/boot/ppc/.md5 2015-09-10 15:20:54.000000000 +0200
+++ new/kiwi/system/boot/ppc/.md5 2015-11-30 10:11:39.000000000 +0100
@@ -3,7 +3,7 @@
for dir in `find -type d`;do
if [ -f $dir/config.xml ];then
pushd $dir &>/dev/null
- find -L -type f | grep -v .svn | grep -v .checksum.md5 |\
+ find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\
xargs md5sum > .checksum.md5
popd &>/dev/null
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-linuxrc
new/kiwi/system/boot/ppc/netboot/suse-linuxrc
--- old/kiwi/system/boot/ppc/netboot/suse-linuxrc 2015-09-10
15:20:54.000000000 +0200
+++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -28,7 +28,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES="ipr lpfc ibmvscsic"
export LOCAL_BOOT="no"
export KERNEL_LIST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-linuxrc
new/kiwi/system/boot/ppc/oemboot/suse-linuxrc
--- old/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2015-10-08
10:32:15.000000000 +0200
+++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES="ipr lpfc ibmvscsic"
export LOCAL_BOOT=no
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc
new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2015-10-08
10:33:09.000000000 +0200
+++ new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES="ipr lpfc ibmvscsic"
export LOCAL_BOOT="no"
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/.md5
new/kiwi/system/boot/s390/.md5
--- old/kiwi/system/boot/s390/.md5 2015-09-10 15:20:54.000000000 +0200
+++ new/kiwi/system/boot/s390/.md5 2015-11-30 10:11:39.000000000 +0100
@@ -3,7 +3,7 @@
for dir in `find -type d`;do
if [ -f $dir/config.xml ];then
pushd $dir &>/dev/null
- find -L -type f | grep -v .svn | grep -v .checksum.md5 |\
+ find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\
xargs md5sum > .checksum.md5
popd &>/dev/null
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc
new/kiwi/system/boot/s390/oemboot/suse-linuxrc
--- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2015-10-08
10:34:10.000000000 +0200
+++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES=""
export LOCAL_BOOT=no
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-linuxrc
new/kiwi/system/boot/s390/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2015-10-08
10:34:23.000000000 +0200
+++ new/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2015-12-11
10:09:29.000000000 +0100
@@ -27,7 +27,6 @@
#======================================
# Exports (Booting)
#--------------------------------------
-export DOMURD_MODULES="xennet xenblk"
export INITRD_MODULES=""
export LOCAL_BOOT="no"
export systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/config.xml
new/kiwi/template/ix86/suse-13.2-JeOS/config.xml
--- old/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2015-10-13
11:42:26.000000000 +0200
+++ new/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2015-12-21
16:12:56.000000000 +0100
@@ -86,6 +86,7 @@
<package name="iputils"/>
<package name="vim"/>
<package name="grub2"/>
+ <package name="grub2-x86_64-efi"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml
new/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml
--- old/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml 2015-10-19
12:44:32.000000000 +0200
+++ new/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml 2015-12-21
16:13:10.000000000 +0100
@@ -113,6 +113,7 @@
<package name="iputils"/>
<package name="vim"/>
<package name="grub2"/>
+ <package name="grub2-x86_64-efi"/>
<package name="syslinux"/>
<package name="lvm2"/>
<package name="plymouth"/>
@@ -186,7 +187,4 @@
-->
<package name="sles-release"/>
</packages>
- <packages type="delete">
- <package name="kernel-debug"/>
- </packages>
</image>
