Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-08-28 21:05:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-08-16 15:37:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-08-28 21:05:32.000000000 +0200
@@ -1,0 +2,113 @@
+Tue Aug 26 20:57:32 CEST 2014 - ms@suse.de
+
+- v5.06.155 released
+
+-------------------------------------------------------------------
+Tue Aug 26 20:55:19 CEST 2014 - ms@suse.de
+
+- Make sure kiwi initrd creates /run/lock (bnc #893624)
+
+ The location for /var/lock has been moved to /run/lock and /var/lock
+ is a symlink instead. /run is a tmpfs and thus the directory must be
+ created properly
+
+-------------------------------------------------------------------
+Tue Aug 26 19:42:42 CEST 2014 - ms@suse.de
+
+- v5.06.154 released
+
+-------------------------------------------------------------------
+Tue Aug 26 19:36:19 CEST 2014 - ms@suse.de
+
+- Don't prevent the pre-init stage if root= is set in the cmdline
+
+ If a root= information is passed to the cmdline kiwi uses this
+ device and wrongly indicates the system has completed the first
+ boot by setting LOCAL_BOOT=yes This prevents the correct setup
+ of the bootloader device.map as well as the bootloader config
+ to be written (bnc #893368)
+
+-------------------------------------------------------------------
+Tue Aug 26 19:32:26 CEST 2014 - ms@suse.de
+
+- Prevent creation of custom /etc/ImagePackages file for the
+ oem and vmx image types. The information there is created
+ at image creation time already and the call increases the
+ first boot time, related to (bnc #893368)
+
+-------------------------------------------------------------------
+Tue Aug 26 18:50:13 CEST 2014 - ms@suse.de
+
+- Fixed schema validation error output
+
+ if the schema is invalid kiwi uses jing to create good error
+ messages but the output of jing was not displayed
+
+-------------------------------------------------------------------
+Mon Aug 25 20:46:22 CEST 2014 - ms@suse.de
+
+- Adapt unit test due to last XSL change
+
+-------------------------------------------------------------------
+Mon Aug 25 20:21:50 CEST 2014 - ms@suse.de
+
+- Fixed xsl/convert58to59.xsl to convert old controller='scsi'
+ to controller='lsilogic' and not 'ide' which unexpectedly
+ changes the layout (bnc #893345)
+
+-------------------------------------------------------------------
+Mon Aug 25 19:56:15 CEST 2014 - ms@suse.de
+
+- Fixed NFS root mount, use nolock option (bnc #892672)
+
+-------------------------------------------------------------------
+Mon Aug 25 19:38:45 CEST 2014 - ms@suse.de
+
+- Fixed package update from sle11 to sle12 (bnc #893340)
+
+ the man pages were moved from kiwi-doc to the main kiwi package
+ between sle11 and sle12. Thus the main kiwi package has to set
+ the correct file provides/obsoletes in order to avoid conflicts
+
+-------------------------------------------------------------------
+Mon Aug 25 15:51:18 CEST 2014 - ms@suse.de
+
+- make sure e2fsprogs is installed explicitly in isoboot
+ boot image descriptions for openSUSE 13.1/13.2 and SLE12
+ There is no package requirement for e2fsprogs which
+ pulls it in (bnc #892087)
+
+-------------------------------------------------------------------
+Mon Aug 25 13:11:31 CEST 2014 - ms@suse.de
+
+- Fixed spec file requirements
+
+ cdrkit-cdrtools-compat is a requirement on suse in order to
+ correctly find the iso tools in the search path
+
+-------------------------------------------------------------------
+Mon Aug 25 09:50:39 CEST 2014 - ms@suse.de
+
+- Fixed legacy service insert/remove using chkconfig
+
+ suseInsertService and suseRemoveService can deal with native systemd
+ services and legacy SYS V init scripts stored in /etc/init.d/. In case
+ of legacy services a call to "chkconfig /etc/init.d/${service} on|off"
+ is issued but fails because chkconfig only expects a service name
+ and not a full path.
+
+-------------------------------------------------------------------
+Sun Aug 24 14:22:23 CEST 2014 - tbechtold@suse.de
+
+- Set sudoers secure_path for vagrant examples
+
+ secure_path is needed to find executables under i.e.
+ /sbin/ when vagrant uses sudo.
+ This fixes the problem when using vagrant-libvirt and
+ sync a folder via 9p which leads currently to:
+
+ ==> devstack1: mounting p9 share in guest
+ modprobe 9p
+ bash: line 2: modprobe: command not found
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.vJz1sc/_old 2014-08-28 21:05:34.000000000 +0200
+++ /var/tmp/diff_new_pack.vJz1sc/_new 2014-08-28 21:05:34.000000000 +0200
@@ -26,9 +26,15 @@
Group: System/Management
Url: http://github.com/openSUSE/kiwi
Name: kiwi
-Version: 5.06.153
+Version: 5.06.155
Release: 0
+Provides: kiwi-image:lxc
+Provides: kiwi-image:tbz
Provides: kiwi-schema = 6.1
+Provides: kiwi:%{_mandir}/man1/KIWI::config.sh.1.gz
+Provides: kiwi:%{_mandir}/man1/KIWI::images.sh.1.gz
+Provides: kiwi:%{_mandir}/man1/KIWI::kiwirc.1.gz
+Provides: kiwi:%{_mandir}/man1/kiwi.1.gz
# requirements to build packages
BuildRequires: diffutils
BuildRequires: e2fsprogs
@@ -56,8 +62,6 @@
%ifarch %ix86 x86_64
BuildRequires: syslinux
%endif
-Provides: kiwi-image:lxc
-Provides: kiwi-image:tbz
%if 0%{?suse_version} > 1140
BuildRequires: btrfsprogs
BuildRequires: cdrkit-cdrtools-compat
@@ -239,6 +243,10 @@
Summary: KIWI - Appliance Builder Documentation
License: LGPL-2.0+
Group: Documentation/Howto
+Obsoletes: kiwi-doc:%{_mandir}/man1/KIWI::config.sh.1.gz
+Obsoletes: kiwi-doc:%{_mandir}/man1/KIWI::images.sh.1.gz
+Obsoletes: kiwi-doc:%{_mandir}/man1/KIWI::kiwirc.1.gz
+Obsoletes: kiwi-doc:%{_mandir}/man1/kiwi.1.gz
%if 0%{?suse_version} > 1120
BuildArch: noarch
%endif
@@ -312,6 +320,7 @@
%endif
Requires: dosfstools
%if 0%{?suse_version}
+Requires: cdrkit-cdrtools-compat
Requires: genisoimage
%endif
@@ -326,7 +335,10 @@
%package -n kiwi-desc-isoboot-requires
Provides: kiwi-boot:isoboot
Provides: kiwi-image:iso
+%if 0%{?suse_version}
+Requires: cdrkit-cdrtools-compat
Requires: genisoimage
+%endif
Requires: kiwi-desc-isoboot = %{version}
Requires: %(echo `bash %{S:4} %{S:0} isoboot %{myarch} %{mysystems}`)
%ifarch ppc ppc64 ppc64le
@@ -396,7 +408,10 @@
Group: System/Management
Provides: kiwi-boot:vmxboot
Provides: kiwi-image:vmx
+%if 0%{?suse_version}
+Requires: cdrkit-cdrtools-compat
Requires: genisoimage
+%endif
Requires: kiwi-desc-vmxboot = %{version}
Requires: %(echo `bash %{S:4} %{S:0} vmxboot %{myarch} %{mysystems}`)
%ifarch ppc ppc64 ppc64le
@@ -474,6 +489,7 @@
Requires: lvm2
Requires: parted
%if 0%{?suse_version}
+Requires: cdrkit-cdrtools-compat
Requires: genisoimage
Requires: multipath-tools
%endif
@@ -505,10 +521,12 @@
Provides: kiwi-boot:oemboot
Provides: kiwi-boot:tbz
Provides: kiwi-image:oem
+%if 0%{?suse_version}
+Requires: cdrkit-cdrtools-compat
Requires: genisoimage
+%endif
Requires: kiwi-desc-oemboot = %{version}
Requires: %(echo `bash %{S:4} %{S:0} oemboot %{myarch} %{mysystems}`)
-
%ifarch ppc ppc64 ppc64le
%if 0%{?suse_version} >= 1315
Requires: grub2-powerpc-ieee1275
++++++ kiwi-docu.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/examples/extras/suse-13.1/suse-vagrant-box/root/etc/sudoers new/doc/examples/extras/suse-13.1/suse-vagrant-box/root/etc/sudoers
--- old/doc/examples/extras/suse-13.1/suse-vagrant-box/root/etc/sudoers 2014-08-12 14:05:04.000000000 +0200
+++ new/doc/examples/extras/suse-13.1/suse-vagrant-box/root/etc/sudoers 2014-08-26 19:44:14.000000000 +0200
@@ -28,6 +28,8 @@
# account if they are allowed to run commands without authentication.
#Defaults env_keep = "LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS XDG_SESSION_COOKIE XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"
+Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
# In the default (unconfigured) configuration, sudo asks for the root password.
# This allows use of an ordinary user account for administration of a freshly
# installed system. When configuring sudo, delete the two
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/examples/extras/suse-SLES11/suse-vagrant-box/root/etc/sudoers new/doc/examples/extras/suse-SLES11/suse-vagrant-box/root/etc/sudoers
--- old/doc/examples/extras/suse-SLES11/suse-vagrant-box/root/etc/sudoers 2014-08-12 14:05:04.000000000 +0200
+++ new/doc/examples/extras/suse-SLES11/suse-vagrant-box/root/etc/sudoers 2014-08-26 19:44:14.000000000 +0200
@@ -28,6 +28,8 @@
# account if they are allowed to run commands without authentication.
#Defaults env_keep = "LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS XDG_SESSION_COOKIE XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"
+Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
# In the default (unconfigured) configuration, sudo asks for the root password.
# This allows use of an ordinary user account for administration of a freshly
# installed system. When configuring sudo, delete the two
++++++ kiwi-repo.tar.bz2 ++++++
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2014-08-13 08:41:31.000000000 +0200
+++ new/kiwi/.revision 2014-08-13 08:41:31.000000000 +0200
@@ -1 +1 @@
-051aebcf0541d230e8a1848ec1d0873a7c265cc5
+b49f8be43d5c765e71a556e9c1424774d25f9d42
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 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh 2014-08-26 19:44:14.000000000 +0200
@@ -54,7 +54,7 @@
fi
done
if [ -x "/etc/init.d/${service}" ];then
- echo "/etc/init.d/${service}"
+ echo "${service}"
fi
}
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 2014-08-15 12:37:18.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm 2014-08-26 20:58:12.000000000 +0200
@@ -1832,7 +1832,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.06.153";
+ $data{Version} = "5.06.155";
$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/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh 2014-08-15 12:37:18.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2014-08-26 20:58:12.000000000 +0200
@@ -455,6 +455,10 @@
ln -s fd/0 $prefix/stdin
ln -s fd/1 $prefix/stdout
ln -s fd/2 $prefix/stderr
+ #======================================
+ # create directories in /run
+ #--------------------------------------
+ mkdir -p -m 0755 /run/lock
}
#======================================
# mount_rpc_pipefs
@@ -4252,7 +4256,6 @@
#--------------------------------------
if [ ! -z "$root" ];then
export biosBootDevice=$(dn $root)
- export LOCAL_BOOT=yes
if [ ! -e /config.partids ];then
echo "kiwi_RootPart=1" > /config.partids
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm new/kiwi/modules/KIWIXMLValidator.pm
--- old/kiwi/modules/KIWIXMLValidator.pm 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/modules/KIWIXMLValidator.pm 2014-08-26 19:44:14.000000000 +0200
@@ -1879,8 +1879,7 @@
};
if ($@) {
my $evaldata=$@;
- $kiwi -> error ("Schema validation failed:\n");
- $kiwi -> error ($evaldata);
+ $kiwi -> error ("Schema validation failed");
$kiwi -> failed ();
my $configStr = $systemXML -> parse_file( $controlFile ) -> toString();
my $upgradedStr = $systemTree -> toString();
@@ -1906,9 +1905,10 @@
my $locator = KIWILocator -> instance();
my $jingExec = $locator -> getExecPath('jing');
if ($jingExec) {
- KIWIQX::qxx (
- "$jingExec $this->{schema} $upgradedContolFile 2>/dev/null"
- );
+ $evaldata = KIWIQX::qxx (
+ "$jingExec $this->{schema} $upgradedContolFile 2>/dev/null"
+ );
+ $kiwi -> error ("$evaldata\n");
return;
} else {
$kiwi -> error ("$evaldata\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-preinit new/kiwi/system/boot/armv7l/oemboot/suse-preinit
--- old/kiwi/system/boot/armv7l/oemboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/armv7l/oemboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200
@@ -116,32 +116,22 @@
fi
#======================================
-# 9) create /etc/ImagePackages
-#--------------------------------------
-if [ "$LOCAL_BOOT" = "no" ];then
- if [ -x /bin/rpm ];then
- Echo "Creating initial image package info file"
- rpm -qa --last > /etc/ImagePackages
- fi
-fi
-
-#======================================
-# 10) setup console
+# 9) setup console
#--------------------------------------
setupConsole
#======================================
-# 11) create origin snapshot if possible
+# 10) create origin snapshot if possible
#--------------------------------------
createOriginSnapshot
#======================================
-# 12) Run user script
+# 11) Run user script
#--------------------------------------
runHook preCallInit
#======================================
-# 13) kill udev
+# 12) kill udev
#--------------------------------------
udevSystemStop
umountSystemFilesystems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml 2014-08-26 19:44:14.000000000 +0200
@@ -149,6 +149,7 @@
<package name="module-init-tools"/>
<package name="which"/>
<package name="udev"/>
+ <package name="e2fsprogs"/>
</packages>
<packages type="delete">
<package name="cracklib-dict-full"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml 2014-08-26 19:44:14.000000000 +0200
@@ -147,6 +147,7 @@
<package name="which"/>
<package name="udev"/>
<package name="sysvinit-tools"/>
+ <package name="e2fsprogs"/>
</packages>
<packages type="delete">
<package name="cracklib-dict-full"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml 2014-08-26 19:44:14.000000000 +0200
@@ -141,6 +141,7 @@
<package name="udev"/>
<package name="wicked"/>
<package name="sysvinit-tools"/>
+ <package name="e2fsprogs"/>
</packages>
<packages type="delete">
<package name="cracklib-dict-full"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml 2014-08-26 19:44:14.000000000 +0200
@@ -141,6 +141,7 @@
<package name="udev"/>
<package name="wicked"/>
<package name="sysvinit-tools"/>
+ <package name="e2fsprogs"/>
</packages>
<packages type="delete">
<package name="cracklib-dict-full"/>
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 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2014-08-26 19:44:14.000000000 +0200
@@ -643,9 +643,9 @@
fi
setupNFSServices
Echo "Mounting NFS root system: $nfsRootServer:$nfsRootDevice..."
- imageRootDevice="-o vers=3,rw $nfsRootServer:$nfsRootDevice"
+ imageRootDevice="-o vers=3,rw,nolock $nfsRootServer:$nfsRootDevice"
if [ ! -z "$COMBINED_IMAGE" ] || [ ! -z "$UNIONFS_CONFIG" ];then
- imageRootDevice="-o vers=3,ro $nfsRootServer:$nfsRootDevice"
+ imageRootDevice="-o vers=3,ro,nolock $nfsRootServer:$nfsRootDevice"
fi
imageRootName="NFSRoot-System"
systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-preinit new/kiwi/system/boot/ix86/oemboot/rhel-preinit
--- old/kiwi/system/boot/ix86/oemboot/rhel-preinit 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/rhel-preinit 2014-08-26 19:44:14.000000000 +0200
@@ -116,37 +116,27 @@
fi
#======================================
-# 9) create /etc/ImagePackages
-#--------------------------------------
-if [ "$LOCAL_BOOT" = "no" ];then
- if [ -x /bin/rpm ];then
- Echo "Creating initial image package info file"
- rpm -qa --last > /etc/ImagePackages
- fi
-fi
-
-#======================================
-# 10) setup console
+# 9) setup console
#--------------------------------------
setupConsole
#======================================
-# 11) create origin snapshot if possible
+# 10) create origin snapshot if possible
#--------------------------------------
createOriginSnapshot
#======================================
-# 12) update auth config
+# 11) update auth config
#--------------------------------------
authconfig --updateall
#======================================
-# 13) Run user script
+# 12) Run user script
#--------------------------------------
runHook preCallInit
#======================================
-# 14) kill udev
+# 13) kill udev
#--------------------------------------
udevSystemStop
umountSystemFilesystems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-preinit new/kiwi/system/boot/ix86/oemboot/suse-preinit
--- old/kiwi/system/boot/ix86/oemboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200
@@ -116,32 +116,22 @@
fi
#======================================
-# 9) create /etc/ImagePackages
-#--------------------------------------
-if [ "$LOCAL_BOOT" = "no" ];then
- if [ -x /bin/rpm ];then
- Echo "Creating initial image package info file"
- rpm -qa --last > /etc/ImagePackages
- fi
-fi
-
-#======================================
-# 10) setup console
+# 9) setup console
#--------------------------------------
setupConsole
#======================================
-# 11) create origin snapshot if possible
+# 10) create origin snapshot if possible
#--------------------------------------
createOriginSnapshot
#======================================
-# 12) Run user script
+# 11) Run user script
#--------------------------------------
runHook preCallInit
#======================================
-# 13) kill udev
+# 12) kill udev
#--------------------------------------
udevSystemStop
umountSystemFilesystems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-preinit new/kiwi/system/boot/ix86/vmxboot/rhel-preinit
--- old/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2014-08-26 19:44:14.000000000 +0200
@@ -49,15 +49,7 @@
createFramebufferDevices
#======================================
-# 6) create /etc/ImagePackages
-#--------------------------------------
-if [ -x /bin/rpm ];then
- Echo "Creating initial image package info file"
- rpm -qa --last > /etc/ImagePackages
-fi
-
-#======================================
-# 7) create initrd on diskful
+# 6) create initrd on diskful
#--------------------------------------
if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then
#======================================
@@ -72,34 +64,34 @@
fi
#======================================
-# 8) Install boot loader if ok
+# 7) Install boot loader if ok
#--------------------------------------
if [ $bootLoaderOK = 1 ];then
installBootLoader
fi
#======================================
-# 9) setup console
+# 8) setup console
#--------------------------------------
setupConsole
#======================================
-# 10) create origin snapshot if possible
+# 9) create origin snapshot if possible
#--------------------------------------
createOriginSnapshot
#======================================
-# 11) update auth config
+# 10) update auth config
#--------------------------------------
authconfig --updateall
#======================================
-# 12) Run user script
+# 11) Run user script
#--------------------------------------
runHook preCallInit
#======================================
-# 13) kill udev
+# 12) kill udev
#--------------------------------------
udevSystemStop
umountSystemFilesystems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-preinit new/kiwi/system/boot/ix86/vmxboot/suse-preinit
--- old/kiwi/system/boot/ix86/vmxboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ix86/vmxboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200
@@ -49,15 +49,7 @@
createFramebufferDevices
#======================================
-# 6) create /etc/ImagePackages
-#--------------------------------------
-if [ -x /bin/rpm ];then
- Echo "Creating initial image package info file"
- rpm -qa --last > /etc/ImagePackages
-fi
-
-#======================================
-# 7) create initrd on diskful
+# 6) create initrd on diskful
#--------------------------------------
if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then
#======================================
@@ -72,29 +64,29 @@
fi
#======================================
-# 8) Install boot loader if ok
+# 7) Install boot loader if ok
#--------------------------------------
if [ $bootLoaderOK = 1 ];then
installBootLoader
fi
#======================================
-# 9) setup console
+# 8) setup console
#--------------------------------------
setupConsole
#======================================
-# 10) create origin snapshot if possible
+# 9) create origin snapshot if possible
#--------------------------------------
createOriginSnapshot
#======================================
-# 11) Run user script
+# 10) Run user script
#--------------------------------------
runHook preCallInit
#======================================
-# 12) kill udev
+# 11) kill udev
#--------------------------------------
udevSystemStop
umountSystemFilesystems
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 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2014-08-26 19:44:14.000000000 +0200
@@ -643,9 +643,9 @@
fi
setupNFSServices
Echo "Mounting NFS root system: $nfsRootServer:$nfsRootDevice..."
- imageRootDevice="-o vers=3,rw $nfsRootServer:$nfsRootDevice"
+ imageRootDevice="-o vers=3,rw,nolock $nfsRootServer:$nfsRootDevice"
if [ ! -z "$COMBINED_IMAGE" ] || [ ! -z "$UNIONFS_CONFIG" ];then
- imageRootDevice="-o vers=3,ro $nfsRootServer:$nfsRootDevice"
+ imageRootDevice="-o vers=3,ro,nolock $nfsRootServer:$nfsRootDevice"
fi
imageRootName="NFSRoot-System"
systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-preinit new/kiwi/system/boot/ppc/oemboot/suse-preinit
--- old/kiwi/system/boot/ppc/oemboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ppc/oemboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200
@@ -116,32 +116,22 @@
fi
#======================================
-# 9) create /etc/ImagePackages
-#--------------------------------------
-if [ "$LOCAL_BOOT" = "no" ];then
- if [ -x /bin/rpm ];then
- Echo "Creating initial image package info file"
- rpm -qa --last > /etc/ImagePackages
- fi
-fi
-
-#======================================
-# 10) setup console
+# 9) setup console
#--------------------------------------
setupConsole
#======================================
-# 11) create origin snapshot if possible
+# 10) create origin snapshot if possible
#--------------------------------------
createOriginSnapshot
#======================================
-# 12) Run user script
+# 11) Run user script
#--------------------------------------
runHook preCallInit
#======================================
-# 13) kill udev
+# 12) kill udev
#--------------------------------------
udevSystemStop
umountSystemFilesystems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-preinit new/kiwi/system/boot/ppc/vmxboot/suse-preinit
--- old/kiwi/system/boot/ppc/vmxboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/ppc/vmxboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200
@@ -49,15 +49,7 @@
createFramebufferDevices
#======================================
-# 6) create /etc/ImagePackages
-#--------------------------------------
-if [ -x /bin/rpm ];then
- Echo "Creating initial image package info file"
- rpm -qa --last > /etc/ImagePackages
-fi
-
-#======================================
-# 7) create initrd on diskful
+# 6) create initrd on diskful
#--------------------------------------
if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then
#======================================
@@ -72,29 +64,29 @@
fi
#======================================
-# 8) Install boot loader if ok
+# 7) Install boot loader if ok
#--------------------------------------
if [ $bootLoaderOK = 1 ];then
installBootLoader
fi
#======================================
-# 9) setup console
+# 8) setup console
#--------------------------------------
setupConsole
#======================================
-# 10) create origin snapshot if possible
+# 9) create origin snapshot if possible
#--------------------------------------
createOriginSnapshot
#======================================
-# 11) Run user script
+# 10) Run user script
#--------------------------------------
runHook preCallInit
#======================================
-# 12) kill udev
+# 11) kill udev
#--------------------------------------
udevSystemStop
umountSystemFilesystems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-linuxrc new/kiwi/system/boot/s390/netboot/suse-linuxrc
--- old/kiwi/system/boot/s390/netboot/suse-linuxrc 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2014-08-26 19:44:14.000000000 +0200
@@ -659,9 +659,9 @@
fi
setupNFSServices
Echo "Mounting NFS root system: $nfsRootServer:$nfsRootDevice..."
- imageRootDevice="-o vers=3,rw $nfsRootServer:$nfsRootDevice"
+ imageRootDevice="-o vers=3,rw,nolock $nfsRootServer:$nfsRootDevice"
if [ ! -z "$COMBINED_IMAGE" ] || [ ! -z "$UNIONFS_CONFIG" ];then
- imageRootDevice="-o vers=3,ro $nfsRootServer:$nfsRootDevice"
+ imageRootDevice="-o vers=3,ro,nolock $nfsRootServer:$nfsRootDevice"
fi
imageRootName="NFSRoot-System"
systemIntegrity="clean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-preinit new/kiwi/system/boot/s390/oemboot/suse-preinit
--- old/kiwi/system/boot/s390/oemboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/s390/oemboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200
@@ -129,22 +129,12 @@
fi
#======================================
-# 10) create /etc/ImagePackages
-#--------------------------------------
-if [ "$LOCAL_BOOT" = "no" ];then
- if [ -x /bin/rpm ];then
- Echo "Creating initial image package info file"
- rpm -qa --last > /etc/ImagePackages
- fi
-fi
-
-#======================================
-# 11) setup console
+# 10) setup console
#--------------------------------------
setupConsole
#======================================
-# 11.1) load network module
+# 11) load network module
#--------------------------------------
if loadNetworkCardS390 "0.0.0191";then
#======================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-preinit new/kiwi/system/boot/s390/vmxboot/suse-preinit
--- old/kiwi/system/boot/s390/vmxboot/suse-preinit 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/system/boot/s390/vmxboot/suse-preinit 2014-08-26 19:44:14.000000000 +0200
@@ -62,15 +62,7 @@
fi
#======================================
-# 7) create /etc/ImagePackages
-#--------------------------------------
-if [ -x /bin/rpm ];then
- Echo "Creating initial image package info file"
- rpm -qa --last > /etc/ImagePackages
-fi
-
-#======================================
-# 8) create initrd on diskful
+# 7) create initrd on diskful
#--------------------------------------
if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then
#======================================
@@ -85,19 +77,19 @@
fi
#======================================
-# 9) Install boot loader if ok
+# 8) Install boot loader if ok
#--------------------------------------
if [ $bootLoaderOK = 1 ];then
installBootLoader
fi
#======================================
-# 10) setup console
+# 9) setup console
#--------------------------------------
setupConsole
#======================================
-# 10.1) load network module
+# 10) load network module
#--------------------------------------
if loadNetworkCardS390 "0.0.0191";then
#======================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXML.pm new/kiwi/tests/unit/lib/Test/kiwiXML.pm
--- old/kiwi/tests/unit/lib/Test/kiwiXML.pm 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/tests/unit/lib/Test/kiwiXML.pm 2014-08-26 19:44:14.000000000 +0200
@@ -6265,7 +6265,7 @@
$this -> assert_str_equals('2', $dvdID);
$this -> assert_str_equals('ide', $dvdCnt);
$this -> assert_str_equals('1', $diskID);
- $this -> assert_str_equals('ide', $diskCnt);
+ $this -> assert_str_equals('lsilogic', $diskCnt);
$this -> assert_str_equals('sles', $guest);
$this -> assert_str_equals('7', $hwver);
$this -> assert_str_equals('1024', $mem);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert58to59.xsl new/kiwi/xsl/convert58to59.xsl
--- old/kiwi/xsl/convert58to59.xsl 2014-08-12 14:05:05.000000000 +0200
+++ new/kiwi/xsl/convert58to59.xsl 2014-08-26 19:44:14.000000000 +0200
@@ -33,16 +33,16 @@
-<!-- rename controller="scsi" to controller="ide" in vmdisk -->
+<!-- rename controller="scsi" to controller="lsilogic" in vmdisk -->
<para xmlns="http://docbook.org/ns/docbook">
- rename controller="scsi" to controller="ide" in vmdisk
+ rename controller="scsi" to controller="lsilogic" in vmdisk
</para>