Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-10-25 08:32:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-18 09:08:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-10-25 08:33:01.000000000 +0200 @@ -1,0 +2,129 @@ +Wed Oct 22 11:50:26 CEST 2014 - [email protected] + +- v7.01.16 released + +------------------------------------------------------------------- +Wed Oct 22 11:20:46 CEST 2014 - [email protected] + +- Fixed setupDefaultFstab (bnc #900280) + + Instead of overwriting a potentially existing fstab file + the function now adds missing entries and also checks if + the source mount device really exists. + +------------------------------------------------------------------- +Wed Oct 22 11:04:37 CEST 2014 - [email protected] + +- Use btrfs as write partition for hybrid images (bnc #900922) + + For hybrid live iso images there is the optional support to + create a write partition for data persistency. The initial + creation of the filesystem can take a long time on e.g USB + sticks. The creation of a btrfs filesystem without static + inode tables is much faster. Thus the switch to btrfs + +------------------------------------------------------------------- +Tue Oct 21 11:12:48 CEST 2014 - [email protected] + +- v7.01.15 released + +------------------------------------------------------------------- +Tue Oct 21 10:29:58 CEST 2014 - [email protected] + +- Print /var/log/boot.kiwi file on reboot exception + + If a reboot exception is thrown in the boot code kiwi will + print the current log file contents to the console before + reboot. This allows systems like public clouds to provide + a verbose information about the boot process + +------------------------------------------------------------------- +Mon Oct 20 21:48:13 CEST 2014 - [email protected] + +- v7.01.14 released + +------------------------------------------------------------------- +Mon Oct 20 19:32:13 CEST 2014 - [email protected] + +- Throw exception if specified root device does not appear + +------------------------------------------------------------------- +Mon Oct 20 17:48:06 CEST 2014 - [email protected] + +- v7.01.13 released + +------------------------------------------------------------------- +Mon Oct 20 17:28:41 CEST 2014 - [email protected] + +- Fixed grub2 setup for use with EC2 + +------------------------------------------------------------------- +Mon Oct 20 13:46:05 CEST 2014 - [email protected] + +- v7.01.12 released + +------------------------------------------------------------------- +Mon Oct 20 13:44:24 CEST 2014 - [email protected] + +- Don't skip grub2 prefix setup for ec2|ec2hvm + +------------------------------------------------------------------- +Mon Oct 20 10:29:23 CEST 2014 - [email protected] + +- v7.01.11 released + +------------------------------------------------------------------- +Mon Oct 20 10:27:40 CEST 2014 - [email protected] + +- Fixed grub2 xen module list + + Some modules available in grub2 are not available for grub2 + in xen, e.g chain + +------------------------------------------------------------------- +Mon Oct 20 09:46:51 CEST 2014 - [email protected] + +- v7.01.10 released + +------------------------------------------------------------------- +Mon Oct 20 09:44:07 CEST 2014 - [email protected] + +- Make sure to wait for the storage device if set in root= + +------------------------------------------------------------------- +Mon Oct 20 09:31:11 CEST 2014 - [email protected] + +- Fixed typo: boottimout -> boottimeout + +------------------------------------------------------------------- +Mon Oct 20 09:28:18 CEST 2014 - [email protected] + +- Make sure correct grub2 module path is used for ec2hvm firmware + + Currently the grub2 module path is set correctly with firmware + set to 'ec2' but not if set to 'ec2hvm' + +------------------------------------------------------------------- +Mon Oct 20 07:02:50 CEST 2014 - [email protected] + +- readd lost promo dvd plugin + +------------------------------------------------------------------- +Fri Oct 17 21:59:26 CEST 2014 - [email protected] + +- Fixed setup of zypper repository name if no alias is specified + + If no alias name is given in the kiwi <repository> section, kiwi + builds a name from the given source URI. If the source URI does + contain credentials information appended as token after the RFC + specified '?' sign the repo name contains this information too + which results in an invalid repository name for zypper. In order + to prevent this kiwi cuts off the information '\?.*' from the + URI and build the name from the remaining part + +------------------------------------------------------------------- +Thu Oct 16 15:37:19 CEST 2014 - [email protected] + +- Redirect stderr from cp command so that we can catch it + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.MOTD5x/_old 2014-10-25 08:33:03.000000000 +0200 +++ /var/tmp/diff_new_pack.MOTD5x/_new 2014-10-25 08:33:03.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.01.9 +Version: 7.01.16 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ 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-09-16 14:54:54.000000000 +0200 +++ new/kiwi/.revision 2014-09-16 20:39:43.000000000 +0200 @@ -1 +1 @@ -67a380c0b26e2b96a8216f9752409d9ded70fd16 +246e906b77d90a76df5872eeea1c911ac611524e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIPromoDVDPlugin.ini new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIPromoDVDPlugin.ini --- old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIPromoDVDPlugin.ini 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIPromoDVDPlugin.ini 2014-10-20 09:39:39.000000000 +0200 @@ -0,0 +1,5 @@ +[base] +name = KIWIPromoDVDPlugin +order = 7 +defaultenable = 1 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIPromoDVDPlugin.pm new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIPromoDVDPlugin.pm --- old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIPromoDVDPlugin.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIPromoDVDPlugin.pm 2014-10-20 09:39:39.000000000 +0200 @@ -0,0 +1,121 @@ +################################################################ +# Copyright (c) 2014 SUSE +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program (see the file LICENSE); if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +# +################################################################ +package KIWIPromoDVDPlugin; + +use strict; +use warnings; + +use base "KIWIBasePlugin"; +use Data::Dumper; +use Config::IniFiles; +use File::Find; +use File::Basename; + +sub new { + # ... + # Create a new KIWIPromoDVDPlugin object + # --- + my $class = shift; + my $handler = shift; + my $config = shift; + my $configpath; + my $configfile; + my $this = KIWIBasePlugin -> new($handler); + bless ($this, $class); + + if ($config =~ m{(.*)/([^/]+)$}x) { + $configpath = $1; + $configfile = $2; + } + if ((! $configpath) || (! $configfile)) { + $this->logMsg("E", + "wrong parameters in plugin initialisation\n" + ); + return; + } + ## plugin content: + #----------------- + #[base] + # name = KIWIEulaPlugin + # order = 3 + # defaultenable = 1 + # + #[target] + # targetfile = content + # targetdir = $PRODUCT_DIR + # media = (list of numbers XOR "all") + # + my $ini = Config::IniFiles -> new( + -file => "$configpath/$configfile" + ); + my $name = $ini->val('base', 'name'); + my $order = $ini->val('base', 'order'); + my $enable = $ini->val('base', 'defaultenable'); + # if any of those isn't set, complain! + if(not defined($name) + or not defined($order) + or not defined($enable) + ) { + $this->logMsg("E", + "Plugin ini file <$config> seems broken!\n" + ); + return; + } + $this->name($name); + $this->order($order); + if($enable != 0) { + $this->ready(1); + } + return $this; +} + +sub execute { + my $this = shift; + if(not ref($this)) { + return; + } + if($this->{m_ready} == 0) { + return 0; + } + my $ismini = $this->collect() + ->productData()->getVar("FLAVOR"); + if(not defined($ismini)) { + $this->logMsg("W", "FLAVOR not set?"); + return 0; + } + if ($ismini !~ m{dvd-promo}ix) { + return 0; + } + my $medium = $this->collect() + ->productData()->getVar("MEDIUM_NAME"); + find( sub { + if (m/initrd.liv/x) { + my $cd = $File::Find::name; + system("mkdir -p boot; echo $medium > boot/mbrid"); + system("echo boot/mbrid | cpio --create --format=newc --quiet | gzip -9 -f >> $cd"); + system("rm boot/mbrid; rmdir boot"); + $this->logMsg("I", "updated $cd"); + } + }, + $this->handler()->collect()->basedir() + ); + return 0; +} + +1; 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 2014-10-07 13:04:28.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2014-10-20 17:47:26.000000000 +0200 @@ -3460,6 +3460,7 @@ my $efipc; my $grubpc; my $grubofw; + my $xenpc; my $bootbios = "$tmpdir/boot/grub2/bootpart.cfg"; my $bootofw = "$tmpdir/boot/grub2/bootpart.cfg"; my $bootefi = "$tmpdir/boot/grub2-efi/bootpart.cfg"; @@ -3474,15 +3475,11 @@ if ($arch eq 'x86_64') { $efipc = 'x86_64-efi'; $grubpc = 'i386-pc'; - if ($firmware eq 'ec2') { - $grubpc = 'x86_64-xen'; - } + $xenpc = 'x86_64-xen'; } elsif ($arch =~ /i.86/) { $efipc = 'i386-efi'; $grubpc = 'i386-pc'; - if ($firmware eq 'ec2') { - $grubpc = 'i386-xen'; - } + $xenpc = 'i386-xen'; } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { $efipc = 'arm64-efi'; $grubpc = 'arm64-efi'; @@ -3547,6 +3544,11 @@ $stages{efi}{shim_suse} = "usr/$lib/efi/shim-opensuse.efi"; $stages{efi}{signed} = "usr/$lib/efi/grub.efi"; } + if (($firmware eq "ec2") || ($firmware eq "ec2hvm")) { + $stages{ec2}{initrd} = "'usr/lib/$grub_bios/$xenpc/*'"; + $stages{ec2}{stageSRC} = "/usr/lib/$grub_bios/$xenpc"; + $stages{ec2}{stageDST} = "/boot/grub2/$xenpc"; + } if ($firmware eq "ofw") { $stages{ofw}{initrd} = "'usr/lib/$grub_ofw/$grubofw/*'"; $stages{ofw}{stageSRC} = "/usr/lib/$grub_ofw/$grubofw"; @@ -3574,12 +3576,10 @@ if ($typeinfo->{lvm}) { push @core_modules, 'lvm'; } - if ($firmware ne 'ec2') { - push @core_modules, 'boot'; - push @bios_core_modules, qw /chain/; - if ($arch =~ /i.86|x86_64/) { - push @bios_core_modules, qw /biosdisk vga vbe multiboot/; - } + push @core_modules, 'boot'; + push @bios_core_modules, qw /chain/; + if ($arch =~ /i.86|x86_64/) { + push @bios_core_modules, qw /biosdisk vga vbe multiboot/; } my @efi_core_modules = ( 'part_gpt','efi_gop' @@ -3602,6 +3602,9 @@ if ($firmware eq "ofw") { @bootdir = ("$tmpdir/boot/grub2/$grubofw"); } + if (($firmware eq 'ec2') || ($firmware eq 'ec2hvm')) { + push @bootdir,"$tmpdir/boot/grub2/$xenpc"; + } if ($arch =~ /i.86|x86_64/) { push @efi_core_modules,'efi_uga'; } @@ -3657,27 +3660,31 @@ #------------------------------------------ $kiwi -> info ("Importing grub2 stage and theming files"); my $figure= "'usr/share/$grub_share/themes/*'"; - my $s_efi = $stages{efi}{initrd}; - my $s_bio = $stages{bios}{initrd}; - my $s_ofw = $stages{ofw}{initrd}; - if (! $s_efi) { - $s_efi = ""; + my $s_efi = ""; + my $s_bio = ""; + my $s_ofw = ""; + my $s_ec2 = ""; + if ($stages{efi}{initrd}) { + $s_efi = "-d $stages{efi}{initrd}"; + } + if ($stages{bios}{initrd}) { + $s_bio = "-d $stages{bios}{initrd}"; } - if (! $s_bio) { - $s_bio = ""; + if ($stages{ofw}{initrd}) { + $s_ofw = "-d $stages{ofw}{initrd}"; } - if (! $s_ofw) { - $s_ofw = ""; + if ($stages{ec2}{initrd}) { + $s_ec2 = "-d $stages{ec2}{initrd}"; } if ($zipped) { $status= KIWIQX::qxx ( "$unzip | \\ - (cd $tmpdir && cpio -i -d $figure -d $s_bio -d $s_efi -d $s_ofw 2>&1)" + (cd $tmpdir && cpio -i -d $figure $s_bio $s_efi $s_ofw $s_ec2 2>&1)" ); } else { $status= KIWIQX::qxx ( "cat $initrd | \\ - (cd $tmpdir && cpio -i -d $figure -d $s_bio -d $s_efi -d $s_ofw 2>&1)" + (cd $tmpdir && cpio -i -d $figure $s_bio $s_efi $s_ofw $s_ec2 2>&1)" ); } #========================================== @@ -3698,6 +3705,7 @@ my $stagesBIOS = 0; my $stagesEFI = 0; my $stagesOFW = 0; + my $stagesEC2 = 0; my @stageFiles = ('bios'); if (($firmware eq "efi") || ($firmware eq "uefi")) { push @stageFiles,'efi'; @@ -3705,6 +3713,9 @@ if ($firmware eq "ofw") { @stageFiles = ('ofw'); } + if (($firmware eq "ec2") || ($firmware eq "ec2hvm")) { + push @stageFiles,'ec2'; + } foreach my $stage (@stageFiles) { my $stageD = $stages{$stage}{stageSRC}; my $stageT = $stages{$stage}{stageDST}; @@ -3719,6 +3730,8 @@ $stagesOK = 1; if ($stage eq 'bios') { $stagesBIOS = 1; + } elsif ($stage eq 'ec2') { + $stagesEC2 = 1; } elsif ($stage eq 'efi') { $stagesEFI = 1; } elsif ($stage eq 'ofw') { @@ -3750,6 +3763,12 @@ $kiwi -> failed (); return; } + if (($firmware =~ /ec2/) && (! $stagesEC2)) { + $kiwi -> failed (); + $kiwi -> error ("No grub2 EC2 Xen stage files found in boot image"); + $kiwi -> failed (); + return; + } $kiwi -> done(); #========================================== # Lookup grub2 mkimage tool @@ -3911,7 +3930,7 @@ #========================================== # Create core grub2 boot images #------------------------------------------ - if ($stagesBIOS) { + if (($stagesBIOS) || ($stagesEC2)) { $kiwi -> info ("Creating grub2 core boot image"); if (! $grub2_bios_mkimage) { $kiwi -> failed (); @@ -4373,9 +4392,7 @@ if ($config eq 'grub2-efi') { print $FD 'set prefix=($root)/boot/grub2-efi'."\n"; } else { - if ($firmware ne 'ec2') { - print $FD 'set prefix=($root)/boot/grub2'."\n"; - } + print $FD 'set prefix=($root)/boot/grub2'."\n"; } # print $FD "set debug=all\n"; print $FD "set default=$defaultBootNr\n"; @@ -5345,7 +5362,7 @@ #------------------------------------------ if ($this->{needJumpP}) { if (($firmware eq "efi") || ($firmware eq "uefi")) { - $status = KIWIQX::qxx ("cp -a $source/EFI $dest"); + $status = KIWIQX::qxx ("cp -a $source/EFI $dest 2>&1"); $result = $? >> 8; if ($result != 0) { $kiwi -> failed (); @@ -5519,7 +5536,7 @@ $kiwi -> failed (); return; } - if (($firmware =~ /bios|ofw/) && (! -e "$stages/$grubimg")) { + if (($firmware =~ /ec2|bios|ofw/) && (! -e "$stages/$grubimg")) { $kiwi -> error ("Mandatory grub2 modules not found"); $kiwi -> failed (); return; 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-10-15 15:10:39.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-10-22 11:50:20.000000000 +0200 @@ -1835,7 +1835,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.01.9"; + $data{Version} = "7.01.16"; $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/KIWIImageCreator.pm new/kiwi/modules/KIWIImageCreator.pm --- old/kiwi/modules/KIWIImageCreator.pm 2014-09-15 16:02:54.000000000 +0200 +++ new/kiwi/modules/KIWIImageCreator.pm 2014-10-20 09:31:09.000000000 +0200 @@ -2025,7 +2025,7 @@ #------------------------------------------ my $boottimeout = $systemType -> getBootTimeout(); if (defined $boottimeout) { - $kiwi -> info ("--> boottimout: $boottimeout"); + $kiwi -> info ("--> boottimeout: $boottimeout"); $bootType -> setBootTimeout($boottimeout); $kiwi -> done(); } 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-10-10 15:10:57.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-10-22 11:19:41.000000000 +0200 @@ -22,7 +22,8 @@ export ELOG_FILE=/var/log/boot.kiwi export TRANSFER_ERRORS_FILE=/tmp/transfer.errors export UFONT=/usr/share/fbiterm/fonts/b16.pcf.gz -export HYBRID_PERSISTENT_FS=ext3 +export HYBRID_PERSISTENT_FS=btrfs +export HYBRID_PERSISTENT_OPTS="" export HYBRID_PERSISTENT_ID=83 export HYBRID_PERSISTENT_DIR=/read-write export UTIMER_INFO=/dev/utimer @@ -328,6 +329,11 @@ Echo -e "$1" case "$what" in "reboot") + # in order to see all log information in case of a reboot exception + # we print the current log contents to the console. On systems like + # public clouds the console information is stored and provided to + # the user. Thus it makes sense to be verbose here + cat $ELOG_FILE Echo "rebootException: reboot in 120 sec..."; sleep 120 /sbin/reboot -f -i >$nuldev ;; @@ -3155,19 +3161,24 @@ #-------------------------------------- function setupDefaultFstab { # /.../ - # create a new /etc/fstab file with the default entries + # Update or create new /etc/fstab file with the default entries # ---- local IFS=$IFS_ORIG local prefix=$1 local nfstab=$prefix/etc/fstab mkdir -p $prefix/etc - cat > $nfstab < /dev/null - echo "devpts /dev/pts devpts mode=0620,gid=5 0 0" >> $nfstab - echo "proc /proc proc defaults 0 0" >> $nfstab - echo "sysfs /sys sysfs noauto 0 0" >> $nfstab - echo "debugfs /sys/kernel/debug debugfs noauto 0 0" >> $nfstab - echo "usbfs /proc/bus/usb usbfs noauto 0 0" >> $nfstab - echo "tmpfs /run tmpfs noauto 0 0" >> $nfstab + grep -q devpts $nfstab || \ + echo "devpts /dev/pts devpts mode=0620,gid=5 0 0" >> $nfstab + grep -q proc $nfstab || \ + echo "proc /proc proc defaults 0 0" >> $nfstab + grep -q sysfs $nfstab || \ + echo "sysfs /sys sysfs noauto 0 0" >> $nfstab + grep -q debugfs $nfstab || test -e /sys/kernel/debug && \ + echo "debugfs /sys/kernel/debug debugfs noauto 0 0" >> $nfstab + grep -q usbfs $nfstab || test -e /proc/bus/usb && \ + echo "usbfs /proc/bus/usb usbfs noauto 0 0" >> $nfstab + grep -q /run $nfstab || test -e /run && \ + echo "tmpfs /run tmpfs noauto 0 0" >> $nfstab } #====================================== # updateRootDeviceFstab @@ -4266,6 +4277,13 @@ # Check root variable #-------------------------------------- if [ ! -z "$root" ];then + if ! waitForStorageDevice $root;then + Echo "Specified root device $root not found. Found devices:" + hwinfo --disk + systemException \ + "root device not found... fatal !" \ + "reboot" + fi export biosBootDevice=$(dn $root) if [ ! -e /config.partids ];then echo "kiwi_RootPart=1" > /config.partids @@ -7804,8 +7822,8 @@ if [ -e /mnt/dev/shm/initrd.msg ];then cp -f /mnt/dev/shm/initrd.msg /mnt/var/log/boot.msg fi - if [ -e /var/log/boot.kiwi ];then - cp -f /var/log/boot.kiwi /mnt/var/log/boot.kiwi + if [ -e $ELOG_FILE ];then + cp -f $ELOG_FILE /mnt/$ELOG_FILE fi if [ ! -d /mnt/var/log/ConsoleKit ];then mkdir -p /mnt/var/log/ConsoleKit @@ -8303,7 +8321,7 @@ export TEXT_BOOT_SETUP_FAILED=$( getText "Bootloader installation has failed") export TEXT_BOOT_SETUP_FAILED_INFO=$( - getText "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") + getText "The system will not be able to reboot. Please make sure to fixup and install the bootloader before next reboot. Check $ELOG_FILE for details") } #====================================== # selectLanguage @@ -8679,9 +8697,8 @@ #====================================== # create filesystem on write partition #-------------------------------------- - local hybrid_opts="-E lazy_itable_init" local hybrid_device=$(ddn $device $pID) - if ! mkfs.$HYBRID_PERSISTENT_FS -L hybrid $hybrid_opts $hybrid_device;then + if ! mkfs.$HYBRID_PERSISTENT_FS -L hybrid $HYBRID_PERSISTENT_OPTS $hybrid_device;then Echo "Failed to create hybrid persistent filesystem" Echo "Persistent writing deactivated" unset kiwi_hybridpersistent 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 2014-09-15 16:02:54.000000000 +0200 +++ new/kiwi/modules/KIWIRoot.pm 2014-10-20 08:29:10.000000000 +0200 @@ -179,6 +179,7 @@ $channel =~ s/_\$//g; $channel =~ s/^_//; $channel =~ s/_$//; + $channel =~ s/\?.*//; } #========================================== # build source key... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
