Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2016-10-18 10:08:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-01 23:46:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2016-10-18 10:08:37.000000000 +0200 @@ -1,0 +2,141 @@ +Wed Oct 12 10:46:46 CEST 2016 - [email protected] + +- v7.04.6 released + +------------------------------------------------------------------- +Tue Oct 11 16:59:30 CEST 2016 - [email protected] + +- Fixing wrong spaces + +------------------------------------------------------------------- +Tue Oct 11 16:48:08 CEST 2016 - [email protected] + +- Make sure there is no splash present when download dialogs appear + +------------------------------------------------------------------- +Tue Oct 11 16:46:22 CEST 2016 - [email protected] + +- Fixed creation of etc/crypttab + + The method setupCryptTab creates etc/crypttab from the given + storage device. However in a raid setup the correct /dev/mdX + device needs to be used and not one of the storage devices in + the raid array. Fixes bnc#1003595 + +------------------------------------------------------------------- +Tue Oct 11 11:38:51 CEST 2016 - [email protected] + +- Solving some broken dialogs + + HideSplash method used to hide the splash only if there was an active + console, however the dialogs appear broken if the splash isn't hidden + and in some cases is hard to check if there is an active consoles + (i.e. after umount /sys or mount --move /dev /mnt/dev).\ + + This commit fixes bnc#997085 + +------------------------------------------------------------------- +Mon Oct 10 17:58:49 CEST 2016 - [email protected] + +- v7.04.5 released + +------------------------------------------------------------------- +Mon Oct 10 17:58:04 CEST 2016 - [email protected] + +- Don't lookup a tool if it is not necessary + + Fixup runtime check for iso tool check + +------------------------------------------------------------------- +Mon Oct 10 17:51:56 CEST 2016 - [email protected] + +- v7.04.4 released + +------------------------------------------------------------------- +Mon Oct 10 17:51:14 CEST 2016 - [email protected] + +- Don't lookup a tool if it is not necessary + +------------------------------------------------------------------- +Mon Oct 10 17:27:24 CEST 2016 - [email protected] + +- v7.04.3 released + +------------------------------------------------------------------- +Mon Oct 10 17:26:52 CEST 2016 - [email protected] + +- Build require an iso creation tool to pass checks + +------------------------------------------------------------------- +Mon Oct 10 17:19:47 CEST 2016 - [email protected] + +- Fixup wicked DNS data validation + + wicked provides DNS info in DNSSERVERS with a space as + separator and not with a ',' as it was the case in dhcpcd + +------------------------------------------------------------------- +Mon Oct 10 16:45:49 CEST 2016 - [email protected] + +- v7.04.2 released + +------------------------------------------------------------------- +Mon Oct 10 12:43:49 CEST 2016 - [email protected] + +- Remove cdrkit-cdrtools-compat from requirements + +------------------------------------------------------------------- +Thu Oct 6 10:49:02 CEST 2016 - [email protected] + +- v7.04.01 released + +------------------------------------------------------------------- +Mon Oct 3 14:28:35 CEST 2016 - [email protected] + +- Added support for mkisofs in addition to genisoimage + + * Removed 'allow-limited-size' which is not supported by mkisofs + * fixCatalog was returning null even if is was not failing + * regex for parsing isoinfo output has been improved to support + mkisofs format + +------------------------------------------------------------------- +Sat Oct 1 11:52:16 CEST 2016 - [email protected] + +- do not use ramdisk for rw, using tmpfs is more efficient + +------------------------------------------------------------------- +Tue Sep 27 20:18:55 CEST 2016 - [email protected] + +- Translated using Weblate (Portuguese (Brazil)) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- +Tue Sep 27 17:19:14 CEST 2016 - [email protected] + +- v7.03.96 released + +------------------------------------------------------------------- +Tue Sep 27 16:43:52 CEST 2016 - [email protected] + +- Make sure netboot code populates kiwi_RootPart + + For disk based images the file config.partids is written and + imported. However, for netboot stations a disk is optional + and no partids information exists. In order to provide at + least the partition number for the root partition on netboot + stations with a disk, the kiwi_RootPart is exported from + the provided client configuration file. Fixes bnc#1000194 + +------------------------------------------------------------------- +Thu Sep 22 10:34:10 CEST 2016 - [email protected] + +- Custom device timeout variable added + + This commit patches the issue bnc#992992. Now DEVICE_TIMEOUT + variable can be used in order to set the device waiting timeout + in watForStorageDevice function. Must be a numeric value expressed + in seconds. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.iMqL7j/_old 2016-10-18 10:08:39.000000000 +0200 +++ /var/tmp/diff_new_pack.iMqL7j/_new 2016-10-18 10:08:39.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.95 +Version: 7.04.6 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc @@ -39,6 +39,7 @@ Conflicts: kiwi-doc < 5 Release: 0 # requirements to build packages +BuildRequires: genisoimage BuildRequires: diffutils BuildRequires: e2fsprogs BuildRequires: gcc-c++ @@ -67,7 +68,6 @@ %endif %if 0%{?suse_version} > 1140 BuildRequires: btrfsprogs -BuildRequires: cdrkit-cdrtools-compat BuildRequires: genisoimage BuildRequires: squashfs BuildRequires: zypper @@ -239,7 +239,6 @@ Requires: inst-source-utils Requires: kiwi-instsource-plugin Requires: kiwi = %{version} -Requires: cdrkit-cdrtools-compat Requires: genisoimage %ifarch %ix86 x86_64 Requires: syslinux @@ -332,7 +331,6 @@ Requires: dosfstools %if 0%{?suse_version} Requires: genisoimage -Requires: cdrkit-cdrtools-compat %endif License: GPL-2.0+ Group: System/Management @@ -350,7 +348,6 @@ Provides: kiwi-boot:isoboot %if 0%{?suse_version} Requires: genisoimage -Requires: cdrkit-cdrtools-compat %endif Requires: kiwi-desc-isoboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} isoboot %{myarch} %{mysystems}`) @@ -423,7 +420,6 @@ Provides: kiwi-boot:vmxboot %if 0%{?suse_version} Requires: genisoimage -Requires: cdrkit-cdrtools-compat %endif Requires: kiwi-desc-vmxboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} vmxboot %{myarch} %{mysystems}`) @@ -509,7 +505,6 @@ Requires: parted %if 0%{?suse_version} Requires: genisoimage -Requires: cdrkit-cdrtools-compat Requires: multipath-tools Requires: mtools Requires: squashfs @@ -546,7 +541,6 @@ Provides: kiwi-boot:tbz %if 0%{?suse_version} Requires: genisoimage -Requires: cdrkit-cdrtools-compat %endif Requires: kiwi-desc-oemboot = %{version} Requires: %(echo `bash %{S:4} %{S:0} oemboot %{myarch} %{mysystems}`) ++++++ 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-01-01 17:37:14.000000000 +0100 +++ new/kiwi/.revision 2016-04-18 16:58:06.000000000 +0200 @@ -1 +1 @@ -73910689f1ec8e634ae790833e797bae2941c579 +c8e3ac299227eb79697dd16c6d602567a05116e9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/pt_BR/LC_MESSAGES/kiwi.po new/kiwi/locale/pt_BR/LC_MESSAGES/kiwi.po --- old/kiwi/locale/pt_BR/LC_MESSAGES/kiwi.po 2015-10-25 16:38:15.000000000 +0100 +++ new/kiwi/locale/pt_BR/LC_MESSAGES/kiwi.po 2016-10-10 16:33:54.000000000 +0200 @@ -10,16 +10,16 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-18 14:46+0200\n" -"PO-Revision-Date: 2015-10-10 19:22+0200\n" -"Last-Translator: Ronan Chagas <[email protected]>\n" +"PO-Revision-Date: 2016-09-27 20:18+0000\n" +"Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" "Language-Team: Portuguese (Brazil) " -"<http://10n.opensuse.org/projects/kiwi/master/pt_BR/>\n" +"<https://l10n.opensuse.org/projects/kiwi/master/pt_BR/>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.3\n" +"X-Generator: Weblate 2.6\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -88,9 +88,9 @@ "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 "" -"O sistema não poderá ser reiniciado. Por favor, assegure-se de consertar e " -"instalar o bootloader antes da próxima reinicialização. Verifique o arquivo " -"/var/log/boot.kiwi para mais detalhes" +"O sistema não poderá ser reiniciado. Certifique-se de corrigir e instalar o " +"carregador de inicialização antes do próximo reinício. Verifique /var/log/" +"boot.kiwi para mais detalhes" msgid "Please remove the CD/DVD before reboot" msgstr "Por favor, remova o CD/DVD antes de reiniciar" 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-09-11 19:09:36.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2016-10-10 16:33:54.000000000 +0200 @@ -925,7 +925,7 @@ my $attr = "-R -J -f -pad -joliet-long"; if (-s $system >= 4294967296) { # install image is bigger than 4g, needs extra iso options - $attr .= " -allow-limited-size -udf -hfs -iso-level 3"; + $attr .= " -udf -hfs -iso-level 3"; } $attr .= " -V \"$volid\""; $attr .= " -A \"$this->{mbrid}\""; 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-09-19 10:53:19.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2016-10-12 10:46:42.000000000 +0200 @@ -2018,7 +2018,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.95"; + $data{Version} = "7.04.6"; $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 2016-01-29 19:40:00.000000000 +0100 +++ new/kiwi/modules/KIWIImage.pm 2016-10-10 16:33:54.000000000 +0200 @@ -2263,10 +2263,13 @@ if (! defined $gzip) { $attr = "-R -J -pad -joliet-long"; } - if (($flags) && ($flags =~ /clic_udf|seed|overlay/)) { - $attr .= " -allow-limited-size -udf"; - } - if (! defined $gzip) { + if ((($flags) && ($flags =~ /clic_udf|seed|overlay/)) && + (defined $gzip)) { + $attr .= " -iso-level 3 -udf"; + } elsif ((($flags) && ($flags =~ /clic_udf|seed|overlay/)) && + (! defined $gzip)) { + $attr .= " -iso-level 4 -udf"; + } elsif (! defined $gzip) { $attr .= " -iso-level 4"; } if ($volid) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2016-01-13 21:52:40.000000000 +0100 +++ new/kiwi/modules/KIWIIsoLinux.pm 2016-10-10 17:39:43.000000000 +0200 @@ -100,15 +100,17 @@ #------------------------------------------ my $locator = KIWILocator -> instance(); my $genTool = $locator -> getExecPath('genisoimage'); - my $mkTool = $locator -> getExecPath('mkisofs'); if ($genTool && -x $genTool) { $tool = $genTool; - } elsif ($mkTool && -x $mkTool) { - $tool = $mkTool; } else { - $kiwi -> error ("No ISO creation tool found"); - $kiwi -> failed (); - return; + my $mkTool = $locator -> getExecPath('mkisofs'); + if ($mkTool && -x $mkTool) { + $tool = $mkTool; + } else { + $kiwi -> error ("No ISO creation tool found"); + $kiwi -> failed (); + return; + } } #======================================= # path setup for supported archs @@ -1007,7 +1009,7 @@ $dir = $1; next; } - if(/^(.).*\s\[\s*(\d+)(\s+\d+)?\]\s+(.*?)\s*$/) { + if(/.*(-)[-rxw]{9}.*\s\[\s*(\d+)(\s+\d+)?\]\s+(.*?)\s*$/) { my $type = $1; $type = ' ' if $type eq '-'; if($4 ne '.' && $4 ne '..') { @@ -1412,7 +1414,7 @@ my $t = (unpack "C", $entry2)[0]; if ($t == 0x90 || $t == 0x91) { close $ISO; - return; + return $this; } substr($entry2, 12, 20) = pack "Ca19", 1, "UEFI (elilo)"; if((unpack "C", $entry2)[0] == 0x88) { 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-09-19 10:52:25.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2016-10-12 10:43:51.000000000 +0200 @@ -115,21 +115,17 @@ #-------------------------------------- function hideSplash { # /.../ - # Only in case of one active console kiwi hides - # the splash screen for it to allow interactive dialog - # sessions on this console. In any other case the user - # can control a custom behavior using the handleSplash + # Hides the splash screen for to allow interactive + # dialog sessions on this console. Also, the user can + # control a custom behavior using the handleSplash # hook called at the end of this function # ---- local IFS=$IFS_ORIG - local console_count=$(activeConsoles) - if [ $console_count -eq 1 ];then - test -e /proc/splash && echo verbose > /proc/splash - if lookup plymouthd &>/dev/null;then - plymouth hide-splash - # reset tty after plymouth messed with it - consoleInit - fi + test -e /proc/splash && echo verbose > /proc/splash + if lookup plymouthd &>/dev/null;then + plymouth hide-splash + # reset tty after plymouth messed with it + consoleInit fi runHook handleSplash "$@" } @@ -1779,7 +1775,12 @@ #-------------------------------------- function setupCryptTab { local IFS=$IFS_ORIG - local rootdevice=$(ddn $imageDiskDevice $kiwi_RootPart) + local rootdevice + if [ ! -z "$RAID" ];then + rootdevice=$(pxeRaidDevice $kiwi_RootPart) + else + rootdevice=$(ddn $imageDiskDevice $kiwi_RootPart) + fi local fsuuid=$(blkid $rootdevice -s UUID -o value) local prefix=$1 if [ -z "$prefix" ];then @@ -5595,7 +5596,7 @@ if [ -z "$DNS" ] && [ -n "$DNSSERVERS" ];then export DNS=$DNSSERVERS fi - IFS="," ; for i in $DNS;do + IFS=", " ; for i in $DNS;do echo "nameserver $i" >> /etc/resolv.conf done export DHCPCHADDR=$( @@ -5839,7 +5840,7 @@ fi if [ -n "$nameserver" ];then export DNS=$nameserver - IFS="," ; for i in $nameserver;do + IFS=", " ; for i in $nameserver;do local line="nameserver $i" if ! grep -q $line $file;then echo "$line" >> "$file" @@ -7402,19 +7403,26 @@ # function to check access on a storage device # which could be a whole disk or a partition. # the function will wait until the size of the - # storage device could be obtained or the check - # counter equals 4 + # storage device could be obtained or the timeout + # is reached. Default timeout is 60 seconds, however + # it can be set to different value by setting the + # DEVICE_TIMEOUT variable in the kernel command + # line. # ---- local IFS=$IFS_ORIG local device=$1 local check=0 + local limit=30 + if [[ $DEVICE_TIMEOUT =~ ^[0-9]+$ ]]; then + limit=$(((DEVICE_TIMEOUT + 1)/ 2)) + fi udevPending while true;do partitionSize $device &>/dev/null - if [ $? = 0 ];then + if [ $? = 0 ]; then sleep 1; return 0 fi - if [ $check -eq 30 ];then + if [ $check -eq $limit ]; then return 1 fi Echo "Waiting for storage device $device to settle..." @@ -7640,6 +7648,7 @@ [ -z "$disableProgressInfo" ] then showProgress=1 + hideSplash read sum1 blocks blocksize zblocks zblocksize < /etc/image.md5 needBytes=$((blocks * blocksize)) needMByte=$((needBytes / 1048576)) @@ -10319,6 +10328,22 @@ fi } #====================================== +# pxeRaidDevice +#-------------------------------------- +function pxeRaidDevice { + # /.../ + # Find the md device in a raid setup for the given partition + # number. The number of the first md device is the number of + # the partition - 1. Thus the md devices starts with md0 and + # the partition devices with e.g sda1 + # ---- + local IFS=$IFS_ORIG + local partition_count=$1 + if [ ! -z "$RAID" ];then + echo "/dev/md$((partition_count - 1))" + fi +} +#====================================== # pxePartitionInputFDASD #-------------------------------------- function pxePartitionInputFDASD { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRuntimeChecker.pm new/kiwi/modules/KIWIRuntimeChecker.pm --- old/kiwi/modules/KIWIRuntimeChecker.pm 2016-07-17 20:02:23.000000000 +0200 +++ new/kiwi/modules/KIWIRuntimeChecker.pm 2016-10-10 17:57:10.000000000 +0200 @@ -621,10 +621,12 @@ } } elsif ($typeName eq 'iso') { my $genTool = $this -> {locator} -> getExecPath('genisoimage'); - my $mkTool = $this -> {locator} -> getExecPath('mkisofs'); - if ((! $genTool) && (! $mkTool)) { - $checkedFS = 'iso'; - $toolError = 1; + if (! $genTool) { + my $mkTool = $this -> {locator} -> getExecPath('mkisofs'); + if (! $mkTool) { + $checkedFS = 'iso'; + $toolError = 1; + } } my $haveTool; if ($flag && $flag =~ /clic|clic_udf/x) { 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 2016-08-09 18:45:03.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2016-10-10 16:33:54.000000000 +0200 @@ -318,6 +318,7 @@ 2) imageVersion=$n; field=3 esac done + export kiwi_RootPart=$(nd $imageDevice) updateNeeded initialize if [ "$partOK" = "1" ] ;then probeFileSystem $imageDevice @@ -693,7 +694,7 @@ systemException "No NBD export name specified" "reboot" fi if [ -z "$nbdwriteDevice" ];then - nbdwriteDevice="/dev/ram1" + nbdwriteDevice="tmpfs" fi waitForBlockDevice $nbdDevice if [ ! -b $nbdDevice ];then @@ -774,7 +775,7 @@ aoeRWDevice=`echo $AOEROOT | cut -d , -f 2` unionFST=`echo $UNIONFS_CONFIG | cut -d , -f 3` if [ -z "$aoeRWDevice" ] || [ "$aoeRODevice" = "$aoeRWDevice" ];then - aoeRWDevice=/dev/ram1 + aoeRWDevice=tmpfs fi if ! modprobe aoe;then systemException "Failed to load AoE module" "reboot" 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 2016-08-09 18:45:03.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2016-10-10 16:33:54.000000000 +0200 @@ -318,6 +318,7 @@ 2) imageVersion=$n; field=3 esac done + export kiwi_RootPart=$(nd $imageDevice) updateNeeded initialize if [ "$partOK" = "1" ] ;then probeFileSystem $imageDevice @@ -693,7 +694,7 @@ systemException "No NBD export name specified" "reboot" fi if [ -z "$nbdwriteDevice" ];then - nbdwriteDevice="/dev/ram1" + nbdwriteDevice="tmpfs" fi waitForBlockDevice $nbdDevice if [ ! -b $nbdDevice ];then @@ -774,7 +775,7 @@ aoeRWDevice=`echo $AOEROOT | cut -d , -f 2` unionFST=`echo $UNIONFS_CONFIG | cut -d , -f 3` if [ -z "$aoeRWDevice" ] || [ "$aoeRODevice" = "$aoeRWDevice" ];then - aoeRWDevice=/dev/ram1 + aoeRWDevice=tmpfs fi if ! modprobe aoe;then systemException "Failed to load AoE module" "reboot" 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 2016-08-09 18:45:03.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2016-10-10 16:33:54.000000000 +0200 @@ -333,6 +333,7 @@ 2) imageVersion=$n; field=3 esac done + export kiwi_RootPart=$(nd $imageDevice) updateNeeded initialize if [ "$partOK" = "1" ] ;then probeFileSystem $imageDevice @@ -710,7 +711,7 @@ systemException "No NBD export name specified" "reboot" fi if [ -z "$nbdwriteDevice" ];then - nbdwriteDevice="/dev/ram1" + nbdwriteDevice="tmpfs" fi waitForBlockDevice $nbdDevice if [ ! -b $nbdDevice ];then @@ -791,7 +792,7 @@ aoeRWDevice=`echo $AOEROOT | cut -d , -f 2` unionFST=`echo $UNIONFS_CONFIG | cut -d , -f 3` if [ -z "$aoeRWDevice" ] || [ "$aoeRODevice" = "$aoeRWDevice" ];then - aoeRWDevice=/dev/ram1 + aoeRWDevice=tmpfs fi if ! modprobe aoe;then systemException "Failed to load AoE module" "reboot"
