Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2016-07-14 09:42:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-05-31 12:08:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2016-07-14 09:42:52.000000000 +0200 @@ -1,0 +2,103 @@ +Wed Jul 6 09:04:08 CEST 2016 - [email protected] + +- v7.03.77 released + +------------------------------------------------------------------- +Wed Jul 6 09:02:25 CEST 2016 - [email protected] + +- Fix potential timing issue after vgchange + + After activation of the volume group with vgchange an + udev wait until the volume device nodes exists should + be performed + +------------------------------------------------------------------- +Tue Jun 28 14:30:20 CEST 2016 - [email protected] + +- v7.03.76 released + +------------------------------------------------------------------- +Tue Jun 28 14:19:07 CEST 2016 - [email protected] + +- Fixed zipl installation + + prior to the zipl installation some parameters are read from the + disk file. kiwi ran another loopsetup call on the raw disk file + to get those values. However while the raw disk is already loop + setup by another loop device this causes problems when calling + fdasd on the new loop. This patch prevents another loopsetup call + and operates on the given block device + +------------------------------------------------------------------- +Tue Jun 21 14:35:21 CEST 2016 - [email protected] + +- v7.03.75 released + +------------------------------------------------------------------- +Fri Jun 17 12:36:00 CEST 2016 - [email protected] + +- Don't run updateMTAB on RHEL6 systems + + RHEL6 doesn't have /etc/mtab as a link. Let's keep original behaviour + + Signed-off-by: Dinar Valeev <[email protected]> + +------------------------------------------------------------------- +Fri Jun 17 12:30:50 CEST 2016 - [email protected] + +- Fix RHEL6 bootloader install + + RHEL expects /etc/grub.conf to be a symlink to /boot/grub/grub.conf, + lets fix a condition where we enter that specific path. + + Signed-off-by: Dinar Valeev <[email protected]> + +------------------------------------------------------------------- +Tue Jun 14 18:38:15 CEST 2016 - [email protected] + +- v7.03.74 released + +------------------------------------------------------------------- +Tue Jun 14 18:35:24 CEST 2016 - [email protected] + +- Fixed creation of install stick + + The bind mountpoint boot directory needs to be created + It's not enough to assume the boot mount point exists in + any case. + +------------------------------------------------------------------- +Tue Jun 14 10:37:39 CEST 2016 - [email protected] + +- Fixed setup of container configuration + + An empty fstab file is created, the former deletion of a + potentially existing fstab failed if no such file existed + +------------------------------------------------------------------- +Sun Jun 12 15:02:33 CEST 2016 - [email protected] + +- v7.03.73 released + +------------------------------------------------------------------- +Sun Jun 12 14:38:48 CEST 2016 - [email protected] + +- Make sure package cache dir is managed + + Fix spec file to create and manage /var/cache/kiwi/packages + +------------------------------------------------------------------- +Mon Jun 6 11:17:08 CEST 2016 - [email protected] + +- Translated using Weblate (Chinese (China)) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- +Mon Jun 6 11:14:01 CEST 2016 - [email protected] + +- Translated using Weblate (Chinese (China)) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.CUQsEQ/_old 2016-07-14 09:42:53.000000000 +0200 +++ /var/tmp/diff_new_pack.CUQsEQ/_new 2016-07-14 09:42:53.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.72 +Version: 7.03.77 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc @@ -704,6 +704,7 @@ %endif mkdir -p $RPM_BUILD_ROOT/var/cache/kiwi +mkdir -p $RPM_BUILD_ROOT/var/cache/kiwi/packages mkdir -p $RPM_BUILD_ROOT/var/cache/kiwi-images test -f $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.0 && \ @@ -792,6 +793,7 @@ %dir %{_datadir}/kiwi/image %dir /var/cache/kiwi %dir /var/cache/kiwi-images +%dir /var/cache/kiwi/packages %doc %{_mandir}/man1/kiwi.1.gz %doc %{_mandir}/man1/KIWI::images.sh.1.gz %doc %{_mandir}/man1/KIWI::config.sh.1.gz ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 18075 lines of diff (skipped) ++++++ 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 2016-04-18 16:58:06.000000000 +0200 +++ new/kiwi/.revision 2016-01-01 17:37:14.000000000 +0100 @@ -1 +1 @@ -d426afa2067161aaee6059b6c9d93eae007ce03c +fce0296a7d7af3ded84f59db9c45970a06f22f9b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/zh_CN/LC_MESSAGES/kiwi.po new/kiwi/locale/zh_CN/LC_MESSAGES/kiwi.po --- old/kiwi/locale/zh_CN/LC_MESSAGES/kiwi.po 2016-04-18 16:58:06.000000000 +0200 +++ new/kiwi/locale/zh_CN/LC_MESSAGES/kiwi.po 2016-06-12 14:36:02.000000000 +0200 @@ -9,15 +9,16 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-18 14:46+0200\n" -"PO-Revision-Date: 2013-01-18 00:11+0800\n" -"Last-Translator: Marguerite Su\n" -"Language-Team: Chinese Traditional <[email protected]>\n" -"Language: zh_TW\n" +"PO-Revision-Date: 2016-06-06 11:17+0000\n" +"Last-Translator: Marguerite Su <[email protected]>\n" +"Language-Team: Chinese (China) " +"<https://l10n.opensuse.org/projects/kiwi/master/zh_CN/>\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 2.6\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -25,10 +26,10 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "于 10 秒内继续引导" msgid "Enter LUKS passphrase" -msgstr "请输入 LUKS 密钥" +msgstr "请输入 LUKS 密码" msgid "Do you accept the license agreement ?" msgstr "您接受许可协议吗？" @@ -48,7 +49,7 @@ msgstr "下面操作会销毁 %1 上的全部数据，继续吗？" msgid "Clean sweep..." -msgstr "清理扫描..." +msgstr "深度清理..." msgid "%1 files from %2 restored..." msgstr "从 %2 中恢复了 %1 个文件..." @@ -80,12 +81,12 @@ msgstr "退出" msgid "Bootloader installation has failed" -msgstr "" +msgstr "引导加载器安装失败" 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 "" +msgstr "系统将无法重新引导。请确保在下次重启前修复并安装好引导加载器。细节请查阅 /var/log/boot.kiwi" msgid "Please remove the CD/DVD before reboot" msgstr "请在重启前弹出 CD/DVD" @@ -97,7 +98,7 @@ msgstr "安装中..." msgid "Loading %1" -msgstr "正在装载 %1" +msgstr "正在加载 %1" msgid "Verifying %1" msgstr "正在验证 %1" @@ -108,10 +109,10 @@ # dialog title for hard disk installation msgid "Select %1 partition for installation:" -msgstr "选择用于安装的 %1 分区：" +msgstr "请选择用于安装的 %1 分区：" msgid "System will be shutdown. Remove USB stick before power on" -msgstr "" +msgstr "系统将关闭。开机前请移除 USB 记忆棒" msgid "Please remove the CD/DVD before shutdown" -msgstr "" +msgstr "关机前请移除 CD/DVD" 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 2016-05-29 22:34:12.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2016-07-06 08:46:15.000000000 +0200 @@ -5687,6 +5687,7 @@ $this -> cleanStack (); return; } + KIWIQX::qxx ("mkdir -p $mount/boot"); KIWIQX::qxx ("mount --bind $bootdir/boot $mount/boot"); KIWIGlobals -> instance() -> push_to_umount_stack ( "umount $mount/boot" @@ -6119,7 +6120,7 @@ #========================================== # detect disk offset of disk image file #------------------------------------------ - $offset = $this -> diskOffset ($diskname); + $offset = $this -> diskOffset ($diskname, $this->{loop}); if (! $offset) { $kiwi -> error ("Failed to detect disk offset"); $kiwi -> failed (); @@ -6181,7 +6182,7 @@ 'DiskSectorSize' ); } - my $chs = $this -> diskCHS($diskname); + my $chs = $this -> diskCHS($diskname, $this->{loop}); my $type = $xml -> getImageType() -> getZiplTargetType(); if (! $type) { if ($bsize == 4096) { @@ -7477,28 +7478,35 @@ # --- my $this = shift; my $disk = shift; + my $diskdev = shift; my $kiwi = $this->{kiwi}; my $tool = $this->{ptool}; my $global = KIWIGlobals -> instance(); my $offset; my $result; my $status; + my $have_loop = 0; if ($tool eq 'fdasd') { - my $loop = $global -> loop_setup($disk, $this->{xml}); + if ((! -f $diskdev) || (! -b $diskdev)) { + $diskdev = $global -> loop_setup($disk, $this->{xml}); + $have_loop = 1; + } my $track_blocks = KIWIQX::qxx( - "fdasd -f -p $loop | grep 'blocks per track' | cut -f2 -d:" + "fdasd -f -p $diskdev|grep 'blocks per track' | cut -f2 -d:" ); $result = $? >> 8; chomp $track_blocks; my $start_tracks = 0; if ($result == 0) { $start_tracks = KIWIQX::qxx( - "fdasd -f -s -p $loop | head -n 1 | tr -s ' ' | cut -f3 -d ' '" + "fdasd -f -s -p $diskdev|head -n 1 | tr -s ' ' | cut -f3 -d ' '" ); $result = $? >> 8; chomp $start_tracks; } - $global -> loop_delete($loop); + if ($have_loop == 1) { + $global -> loop_delete($diskdev); + } $offset = int($track_blocks) * int($start_tracks); } else { $status = KIWIQX::qxx( @@ -7539,6 +7547,7 @@ sub diskCHS { my $this = shift; my $disk = shift; + my $diskdev = shift; my $kiwi = $this->{kiwi}; my $tool = $this->{ptool}; my $global = KIWIGlobals -> instance(); @@ -7546,32 +7555,38 @@ my $tracks; my $blocks; my $result; + my $have_loop = 0; if ($tool ne 'fdasd') { $kiwi -> error ("CHS retrieval only implemented for fdasd"); $kiwi -> failed(); return; } - my $loop = $global -> loop_setup($disk, $this->{xml}); + if ((! -f $diskdev) || (! -b $diskdev)) { + $diskdev = $global -> loop_setup($disk, $this->{xml}); + $have_loop = 1; + } $cylinders = KIWIQX::qxx( - "fdasd -f -p $loop | grep cylinders | cut -f2 -d:" + "fdasd -f -p $diskdev | grep cylinders | cut -f2 -d:" ); $result = $? >> 8; chomp $cylinders; if ($result == 0) { $tracks = KIWIQX::qxx( - "fdasd -f -p $loop | grep 'tracks per cylinder' | cut -f2 -d:" + "fdasd -f -p $diskdev | grep 'tracks per cylinder' | cut -f2 -d:" ); $result = $? >> 8; chomp $tracks; } if ($result == 0) { $blocks = KIWIQX::qxx( - "fdasd -f -p $loop | grep 'blocks per track' | cut -f2 -d:" + "fdasd -f -p $diskdev | grep 'blocks per track' | cut -f2 -d:" ); $result = $? >> 8; chomp $blocks; } - $global -> loop_delete($loop); + if ($have_loop == 1) { + $global -> loop_delete($diskdev); + } if ($result != 0) { $kiwi -> error ("Failed to obtain CHS geometry"); $kiwi -> failed(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIContainerBuilder.pm new/kiwi/modules/KIWIContainerBuilder.pm --- old/kiwi/modules/KIWIContainerBuilder.pm 2016-04-18 16:58:06.000000000 +0200 +++ new/kiwi/modules/KIWIContainerBuilder.pm 2016-06-15 21:42:08.000000000 +0200 @@ -182,7 +182,7 @@ # Create empty fstab file #------------------------------------------ my $rm = $locator -> getExecPath('rm'); - my $cmd = "$rm $targetDir/etc/fstab"; + my $cmd = "$rm -f $targetDir/etc/fstab"; my $data = KIWIQX::qxx ($cmd); my $code = $? >> 8; if ($code != 0) { 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 2016-05-30 15:45:25.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2016-07-06 09:04:03.000000000 +0200 @@ -1291,6 +1291,8 @@ } push @UmountStack,"vgchange -a n $vgname"; $this->{UmountStack} = \@UmountStack; + # wait for the mapping to finish + KIWIQX::qxx ("udevadm settle --timeout=30 2>&1"); $sdev = "/dev/mapper/$vgname-LVComp"; if (! -e $sdev) { $sdev = "/dev/mapper/$vgname-LVRoot"; @@ -2016,7 +2018,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.72"; + $data{Version} = "7.03.77"; $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 2016-05-29 22:33:49.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2016-07-06 08:46:15.000000000 +0200 @@ -1179,7 +1179,7 @@ Echo "Failed to install boot loader" return 1 fi - if [[ $kiwi_iname =~ boot-rhel ]];then + if [[ $kiwi_cpio_name =~ boot-rhel ]];then # on rhel systems grub.conf is a link to menu.lst. rm -f /etc/grub.conf ln -s /boot/grub/menu.lst /etc/grub.conf @@ -4992,20 +4992,24 @@ # updateMTAB #-------------------------------------- function updateMTAB { - local IFS=$IFS_ORIG - local prefix=$1 - local umount=0 - if [ ! -e /proc/mounts ];then - mount -t proc proc /proc - umount=1 - fi - if [ -e /proc/self/mounts ];then - pushd $prefix/etc >/dev/null - rm -f mtab && ln -s /proc/self/mounts mtab - popd >/dev/null - fi - if [ $umount -eq 1 ];then - umount /proc + if [[ $kiwi_cpio_name =~ "boot-rhel-06" ]];then + echo "Skipping creation of /etc/mtab -> /proc/self/mounts symlink" + else + local IFS=$IFS_ORIG + local prefix=$1 + local umount=0 + if [ ! -e /proc/mounts ];then + mount -t proc proc /proc + umount=1 + fi + if [ -e /proc/self/mounts ];then + pushd $prefix/etc >/dev/null + rm -f mtab && ln -s /proc/self/mounts mtab + popd >/dev/null + fi + if [ $umount -eq 1 ];then + umount /proc + fi fi } #======================================
