Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri Aug 12 13:43:15 CEST 2011.
-------- --- kiwi/kiwi.changes 2011-07-29 12:04:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-08-12 11:25:40.000000000 +0200 @@ -1,0 +2,79 @@ +Fri Aug 12 11:20:44 CEST 2011 - [email protected] + +- v4.94.2 released + +------------------------------------------------------------------- +Thu Aug 11 12:41:56 CEST 2011 - [email protected] + +- fixed default label text for ext|syslinux setup + +------------------------------------------------------------------- +Thu Aug 11 12:20:48 CEST 2011 - [email protected] + +- fixed vfat boot partition id lookup in setupBootPartition() + +------------------------------------------------------------------- +Thu Aug 11 11:27:14 CEST 2011 - [email protected] + +- make sure the text message file isolinux.msg is created in + case of a sys|extlinux based virtual disk image + +------------------------------------------------------------------- +Thu Aug 11 11:06:30 CEST 2011 - [email protected] + +- make sure loader variable is initialized as early as possible + also make sure .profile is loaded inside the initialize() + function. This allows to setup loader by the value of the + kiwi_bootloader variable in an early phase + +------------------------------------------------------------------- +Wed Aug 10 15:02:56 CEST 2011 - [email protected] + +- make sure the which command is part of the initrd + +------------------------------------------------------------------- +Wed Aug 10 13:46:58 CEST 2011 - [email protected] + +- don't configure a graphics boot screen in grub if no + bootscreen picture data is available + +------------------------------------------------------------------- +Wed Aug 10 12:50:16 CEST 2011 - [email protected] + +- allow init=/path/to/program option for kiwi images + +------------------------------------------------------------------- +Tue Aug 9 12:02:18 CEST 2011 - [email protected] + +- in 12.1 the sysconfig.kernel file has been changed into a + sysconfig.kernel-mkinitrd file. + +------------------------------------------------------------------- +Tue Aug 9 11:58:25 CEST 2011 - [email protected] + +- suppress error message on stat evaluation for rpc_pipefs + +------------------------------------------------------------------- +Mon Aug 8 11:44:01 CEST 2011 - [email protected] + +- use getExecPath() to locate parted binary, also allow + alternative location of parted inside the linuxrc code + +------------------------------------------------------------------- +Mon Aug 8 11:37:19 CEST 2011 - [email protected] + +- When the Boot image's repositories are updated/reconfigured, + the priority and alias information is chopped off. This patch + makes sure the priority information is retained. + +------------------------------------------------------------------- +Mon Aug 8 11:35:36 CEST 2011 - [email protected] + +- use getExecPath() to find the grub binary. Along with this + change the extraction of the grub binary from the initrd has + been removed. That binary never was called. + +- allow alternative location for the grub binary inside the + linuxrc boot code + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.gHGBFj/_old 2011-08-12 13:42:44.000000000 +0200 +++ /var/tmp/diff_new_pack.gHGBFj/_new 2011-08-12 13:42:44.000000000 +0200 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.94.1 +Version: 4.94.2 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-07-22 15:26:57.000000000 +0200 +++ new/kiwi/.revision 2011-07-22 15:26:57.000000000 +0200 @@ -1 +1 @@ -ebd8893921c64778cfbbfc49f1a949aeeb024ac7 +eeaddf41a27ee015cf72107cb73ec22b1c630637 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 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2011-08-12 11:22:10.000000000 +0200 @@ -2806,8 +2806,7 @@ #------------------------------------------ if ($loader eq "grub") { my $stages = "'usr/lib/grub/*'"; - my $message= "'image/loader/message'"; - my $gbinary= "'usr/sbin/grub'"; + my $figure = "'image/loader/message'"; my $unzip = "$zipper -cd $initrd 2>&1"; $status = qxx ( "mkdir -p $tmpdir/boot/grub 2>&1" ); $result = $? >> 8; @@ -2818,50 +2817,28 @@ return undef; } #========================================== - # Get Grub binary from initrd - #------------------------------------------ - $kiwi -> info ("Importing grub binary"); - if ($zipped) { - $status= qxx ("$unzip | (cd $tmpdir && cpio -di $gbinary 2>&1)"); - } else { - $status= qxx ("cat $initrd|(cd $tmpdir && cpio -di $gbinary 2>&1)"); - } - if (! -e $tmpdir."/usr/sbin/grub" ) { - $kiwi -> failed (); - $kiwi -> error ("No grub bootloader found in initrd: $status"); - $kiwi -> failed (); - return undef; - } - $kiwi -> done (); - #========================================== # Get Grub graphics boot message #------------------------------------------ - $kiwi -> info ("Importing graphics boot message"); + $kiwi -> info ("Importing graphics boot message and stage files"); if ($zipped) { - $status= qxx ("$unzip | (cd $tmpdir && cpio -di $message 2>&1)"); + $status= qxx ( + "$unzip | (cd $tmpdir && cpio -i -d $figure -d $stages 2>&1)" + ); } else { - $status= qxx ("cat $initrd|(cd $tmpdir && cpio -di $message 2>&1)"); + $status= qxx ( + "cat $initrd|(cd $tmpdir && cpio -i -d $figure -d $stages 2>&1)" + ); } if (-e $tmpdir."/image/loader/message") { - $status = qxx ("mv $tmpdir/$message $tmpdir/boot/message 2>&1"); + $status = qxx ("mv $tmpdir/$figure $tmpdir/boot/message 2>&1"); $result = $? >> 8; $kiwi -> done(); } else { $kiwi -> skipped(); } #========================================== - # Get Grub stage files from initrd + # check Grub stage files... #------------------------------------------ - $kiwi -> info ("Importing grub stages"); - if ($zipped) { - $status = qxx ( - "$unzip | (cd $tmpdir && cpio -di $stages 2>&1)" - ); - } else { - $status = qxx ( - "cat $initrd | (cd $tmpdir && cpio -di $stages 2>&1)" - ); - } if (glob($tmpdir."/usr/lib/grub/*")) { $status = qxx ( "mv $tmpdir/usr/lib/grub/* $tmpdir/boot/grub 2>&1" @@ -2874,7 +2851,7 @@ $result = $? >> 8; } } else { - $kiwi -> skipped (); chomp $status; + chomp $status; $kiwi -> error ("Failed importing grub stages: $status"); $kiwi -> skipped (); $kiwi -> info ("Trying to use grub stages from local machine"); @@ -2887,13 +2864,11 @@ $result = $? >> 8; } if ($result != 0) { - $kiwi -> failed (); $kiwi -> error ("Failed importing grub stages: $status"); $kiwi -> failed (); return undef; } } - $kiwi -> done(); } #========================================== # syslinux @@ -2962,7 +2937,6 @@ #========================================== # setup boot loader default boot label/nr #------------------------------------------ - my $defaultBootLabel = $label; my $defaultBootNr = 0; if ($xml) { %type = %{$xml->getImageTypeAndAttributes()}; @@ -2987,15 +2961,9 @@ # 2 -> Failsafe -- Install/Restore $label # ---- if ($type{installboot} eq "install") { - $defaultBootLabel= makeLabel ( - "Install/Restore $label" - ); $defaultBootNr = 1; } if ($type{installboot} eq "failsafe-install") { - $defaultBootLabel= makeLabel ( - "Failsafe -- Install/Restore $label" - ); $defaultBootNr = 2; } } @@ -3068,7 +3036,7 @@ print FD "timeout $bootTimeout\n"; if ($type =~ /^KIWI (CD|USB)/) { my $dev = $1 eq 'CD' ? '(cd)' : '(hd0,0)'; - if (! $type{fastboot}) { + if ((! $type{fastboot}) && (-e "$tmpdir/boot/message")) { print FD "gfxmenu $dev/boot/message\n"; } print FD "title Boot from Hard Disk\n"; @@ -3092,7 +3060,9 @@ print FD "title $title\n"; } else { $title = $this -> makeLabel ("$label [ $type ]"); - print FD "gfxmenu (hd0,$bootpart)/boot/message\n"; + if (-e "$tmpdir/boot/message") { + print FD "gfxmenu (hd0,$bootpart)/boot/message\n"; + } print FD "title $title\n"; } #========================================== @@ -3246,12 +3216,12 @@ #========================================== # General syslinux setup #------------------------------------------ - print FD "default $defaultBootLabel"."\n"; print FD "implicit 1"."\n"; print FD "prompt 1"."\n"; my $bootTimeout = $type{boottimeout} ? int $type{boottimeout} : 200; print FD "timeout $bootTimeout"."\n"; print FD "display isolinux.msg"."\n"; + my @labels = (); if (-f "$gfx/bootlogo") { if ($syslinux_new_format) { print FD "ui gfxboot bootlogo isolinux.msg"."\n"; @@ -3260,15 +3230,18 @@ } } if ($type =~ /^KIWI (CD|USB)/) { - $title = $this -> makeLabel ("Boot from Hard Disk"); - print FD "label $title\n"; - print FD "localboot 0x80\n"; $title = $this -> makeLabel ("Install/Restore $label"); - print FD "label $title\n"; } else { $title = $this -> makeLabel ("$label [ $type ]"); - print FD "label $title"."\n"; } + print FD "default $title"."\n"; + if ($type =~ /^KIWI (CD|USB)/) { + my $localboot = $this -> makeLabel ("Boot from Hard Disk"); + print FD "label $localboot\n"; + print FD "localboot 0x80\n"; + } + print FD "label $title"."\n"; + push @labels,$title; #========================================== # Standard boot #------------------------------------------ @@ -3320,6 +3293,7 @@ $title = $this -> makeLabel ("Failsafe -- $label [ $type ]"); print FD "label $title"."\n"; } + push @labels,$title; if (! $isxen) { if ($type =~ /^KIWI CD/) { print FD "kernel linux\n"; @@ -3360,6 +3334,22 @@ } print FD $cmdline; close FD; + #========================================== + # setup isolinux.msg file + #------------------------------------------ + if (! open (FD,">$tmpdir/boot/syslinux/isolinux.msg")) { + $kiwi -> failed(); + $kiwi -> error ("Failed to create isolinux.msg: $!"); + $kiwi -> failed (); + return undef; + } + print FD "\n"."Welcome !"."\n\n"; + foreach my $label (@labels) { + print FD "$label"."\n"; + } + print FD "\n\n"; + print FD "Have a lot of fun..."."\n"; + close FD; $kiwi -> done(); } #========================================== @@ -3596,6 +3586,7 @@ my $bootpart = $this->{bootpart}; my $chainload= $this->{chainload}; my $lvm = $this->{lvm}; + my $locator = new KIWILocator($kiwi); my $result; my $status; #========================================== @@ -3625,7 +3616,13 @@ #========================================== # Install grub in batch mode #------------------------------------------ - my $grub = "/usr/sbin/grub"; + my $grub = $locator -> getExecPath ('grub'); + if (! $grub) { + $kiwi -> failed (); + $kiwi -> error ("Can't locate grub binary"); + $kiwi -> failed (); + return undef; + } my $grubOptions = "--device-map $dmfile --no-floppy --batch"; $kiwi -> loginfo ("GRUB: $grub $grubOptions\n"); qxx ("mount --bind $tmpdir/boot/grub /boot/grub"); @@ -4098,19 +4095,21 @@ my $status; my $result; my $parted; + my $locator = new KIWILocator($kiwi); + my $parted_exec = $locator -> getExecPath("parted"); $status = qxx ("dd if=/dev/zero of=$disk bs=512 count=1 2>&1"); $result = $? >> 8; if ($result != 0) { $kiwi -> loginfo ($status); return 0; } - $status = qxx ("/usr/sbin/parted -s $disk mklabel msdos 2>&1"); + $status = qxx ("$parted_exec -s $disk mklabel msdos 2>&1"); $result = $? >> 8; if ($result != 0) { $kiwi -> loginfo ($status); return 0; } - $parted = "/usr/sbin/parted -m $disk unit cyl print"; + $parted = "$parted_exec -m $disk unit cyl print"; $status = qxx ( "$parted | head -n 3 | tail -n 1 | cut -f4 -d: | tr -d 'kB;'" ); @@ -4239,6 +4238,8 @@ my $status; my $ignore; my $action; + my $locator = new KIWILocator($kiwi); + my $parted_exec = $locator -> getExecPath("parted"); if (! defined $tool) { $tool = "parted"; } @@ -4330,14 +4331,14 @@ "PARTED input: $device [@p_cmd]" ); my $align=""; - $status = qxx ("/usr/sbin/parted --help | grep -q align="); + $status = qxx ("$parted_exec --help | grep -q align="); $result = $? >> 8; if ($result == 0) { $align="-a cyl"; } foreach my $p_cmd (@p_cmd) { $status= qxx ( - "/usr/sbin/parted $align -s $device unit cyl $p_cmd 2>&1" + "$parted_exec $align -s $device unit cyl $p_cmd 2>&1" ); $result= $? >> 8; $kiwi -> loginfo ($status); 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 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2011-08-12 11:22:10.000000000 +0200 @@ -985,7 +985,7 @@ setterm kpartx vgcfgbackup vgcfgrestore lsdasd dasd_configure qeth_configure fdasd mkdosfs egrep mkfs.xfs mdadm yes fdisk startproc zfcp_host_configure zfcp_disk_configure vgrename - kpartx_id mpath_id dmraid dmevent_tool + kpartx_id mpath_id dmraid dmevent_tool which " tools="$tools $@" for path in /sbin /usr/sbin /usr/bin /bin;do 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 2011-07-29 12:00:21.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-08-12 11:22:10.000000000 +0200 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.94.1"; + $data{Version} = "4.94.2"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de";; $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 2011-07-29 12:00:21.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-08-12 11:22:10.000000000 +0200 @@ -34,10 +34,11 @@ #-------------------------------------- arch=`uname -m` if [ "$arch" = "ppc64" ];then - loader=lilo + test -z "$loader" && export loader=lilo test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/hvc0 test -z "$ELOG_CONSOLE" && export ELOG_CONSOLE=/dev/hvc0 else + test -z "$loader" && export loader=grub test -z "$ELOG_CONSOLE" && export ELOG_CONSOLE=/dev/tty3 test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/tty2 fi @@ -66,7 +67,7 @@ test -z "$CONSOLE" && export CONSOLE=/dev/console test -z "$REDIRECT" && export REDIRECT=/dev/tty1 fi -if [ -e /usr/sbin/parted ];then +if [ -e $(which parted) ];then if parted -h | grep -q '\-\-align';then export PARTED_HAVE_ALIGN=1 fi @@ -324,7 +325,7 @@ fi test -e /proc/splash && echo verbose > /proc/splash if [ $what = "reboot" ];then - if cat /proc/cmdline | grep -qi "kiwidebug=1";then + if cat /proc/cmdline 2>/dev/null | grep -qi "kiwidebug=1";then what="shell" fi fi @@ -436,7 +437,7 @@ #-------------------------------------- function mount_rpc_pipefs { # See if the file system is there yet - case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs` in + case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs 2>/dev/null` in *67596969*) return 0;; esac @@ -447,7 +448,7 @@ #-------------------------------------- function umount_rpc_pipefs { # See if the file system is there - case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs` in + case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs 2>/dev/null` in *67596969*) umount /var/lib/nfs/rpc_pipefs esac @@ -714,9 +715,6 @@ # ---- resetBootBind local arch=`uname -m` - if [ -z "$loader" ];then - loader="grub" - fi case $arch-$loader in i*86-grub) installBootLoaderGrub ;; x86_64-grub) installBootLoaderGrub ;; @@ -750,9 +748,6 @@ # happens according to the architecture of the system # ---- local arch=`uname -m` - if [ -z "$loader" ];then - loader="grub" - fi case $arch-$loader in i*86-grub) installBootLoaderGrubRecovery ;; x86_64-grub) installBootLoaderGrubRecovery ;; @@ -809,9 +804,9 @@ # install the grub according to the contents of # /etc/grub.conf and /boot/grub/menu.lst # ---- - if [ -x /usr/sbin/grub ];then + if [ -x $(which grub) ];then Echo "Installing boot loader..." - /usr/sbin/grub --batch --no-floppy < /etc/grub.conf 1>&2 + grub --batch --no-floppy < /etc/grub.conf 1>&2 if [ ! $? = 0 ];then Echo "Failed to install boot loader" fi @@ -878,8 +873,8 @@ echo "root (hd0,$gdevreco)" >> $input echo "setup (hd0,$gdevreco)" >> $input echo "quit" >> $input - if [ -x /usr/sbin/grub ];then - /usr/sbin/grub --batch < $input 1>&2 + if [ -x $(which grub) ];then + grub --batch < $input 1>&2 rm -f $input else Echo "Image doesn't have grub installed" @@ -998,12 +993,6 @@ para="$para \"$1\"" shift done - if [ ! -z "$kiwi_bootloader" ];then - loader=$kiwi_bootloader - fi - if [ -z "$loader" ];then - loader="grub" - fi case $arch-$loader in i*86-grub) eval setupBootLoaderGrub $para ;; x86_64-grub) eval setupBootLoaderGrub $para ;; @@ -1073,9 +1062,6 @@ para="$para \"$1\"" shift done - if [ -z "$loader" ];then - loader="grub" - fi case $arch-$loader in i*86-grub) eval setupBootLoaderGrubRecovery $para ;; x86_64-grub) eval setupBootLoaderGrubRecovery $para ;; @@ -1362,12 +1348,6 @@ local diskByID=`getDiskID $rdev` local swapByID=`getDiskID $swap swap` #====================================== - # check for boot image .profile - #-------------------------------------- - if [ -f /.profile ];then - importFile < /.profile - fi - #====================================== # check for bootloader displayname #-------------------------------------- if [ -z "$kiwi_oemtitle" ] && [ ! -z "$kiwi_displayname" ];then @@ -1563,12 +1543,6 @@ local diskByID=`getDiskID $rdev` local swapByID=`getDiskID $swap swap` #====================================== - # check for boot image .profile - #-------------------------------------- - if [ -f /.profile ];then - importFile < /.profile - fi - #====================================== # check for bootloader displayname #-------------------------------------- if [ -z "$kiwi_oemtitle" ] && [ ! -z "$kiwi_displayname" ];then @@ -1789,12 +1763,6 @@ local diskByID=`getDiskID $rdev` local swapByID=`getDiskID $swap swap` #====================================== - # check for boot image .profile - #-------------------------------------- - if [ -f /.profile ];then - importFile < /.profile - fi - #====================================== # check for system image .profile #-------------------------------------- if [ -f $mountPrefix/image/.profile ];then @@ -2054,12 +2022,6 @@ local diskByID=`getDiskID $rdev` local swapByID=`getDiskID $swap swap` #====================================== - # check for boot image .profile - #-------------------------------------- - if [ -f /.profile ];then - importFile < /.profile - fi - #====================================== # check for bootloader displayname #-------------------------------------- if [ -z "$kiwi_oemtitle" ] && [ ! -z "$kiwi_displayname" ];then @@ -2463,6 +2425,7 @@ srcprefix=/mnt fi local sysimg_ktempl=$srcprefix/var/adm/fillup-templates/sysconfig.kernel + local sysimg_ktempl2=$sysimg_ktempl-mkinitrd local sysimg_syskernel=$srcprefix/etc/sysconfig/kernel local syskernel=$destprefix/etc/sysconfig/kernel local newstyle_mkinitrd=$srcprefix/lib/mkinitrd/scripts/boot-usb.sh @@ -2472,7 +2435,7 @@ #====================================== # check for sysconfig template file #-------------------------------------- - if [ ! -f $sysimg_ktempl ];then + if [ ! -f $sysimg_ktempl ] && [ ! -f $sysimg_ktempl2 ];then systemException \ "Can't find kernel sysconfig template in system image !" \ "reboot" @@ -3098,9 +3061,6 @@ local ecode=0 local cdopt mkdir -p /cdrom - if [ -f /.profile ];then - importFile < /.profile - fi #====================================== # check for hybrid mbr ID #-------------------------------------- @@ -5547,6 +5507,12 @@ local reboot=no local option=$@ #====================================== + # check for init kernel option + #-------------------------------------- + if [ -z "$init" ];then + init=/sbin/init + fi + #====================================== # turn runlevel 4 to 5 if found #-------------------------------------- option=$(echo $@ | sed -e s@4@5@) @@ -5598,7 +5564,7 @@ exec /lib/mkinitrd/bin/run-init -c /dev/console /mnt /bin/bash -c \ "/preinit ; . /include ; cleanImage ; exec /sbin/reboot -f -i" fi - if [ $rebootinter = "yes" ];then + if [ "$rebootinter" = "yes" ];then Echo "Reboot requested... rebooting after preinit" if [ "$OEMInstallType" = "CD" ];then TEXT_DUMP=$TEXT_CDPULL @@ -5613,12 +5579,12 @@ exec /lib/mkinitrd/bin/run-init -c /dev/console /mnt /bin/bash -c \ "/preinit ; . /include ; cleanImage ; exec /sbin/reboot -f -i" fi - if [ $shutdown = "yes" ];then + if [ "$shutdown" = "yes" ];then Echo "Shutdown requested... system shutdown after preinit" exec /lib/mkinitrd/bin/run-init -c /dev/console /mnt /bin/bash -c \ "/preinit ; . /include ; cleanImage ; exec /sbin/halt -fihp" fi - if [ $shutdowninter = "yes" ];then + if [ "$shutdowninter" = "yes" ];then Echo "Shutdown requested... system shutdown after preinit" if [ "$OEMInstallType" = "CD" ];then TEXT_DUMP=$TEXT_CDPULL_SDOWN @@ -5636,10 +5602,10 @@ # FIXME: clicfs / nfsroot doesn't like run-init if [ ! "$haveClicFS" = "yes" ] && [ -z "$NFSROOT" ];then exec /lib/mkinitrd/bin/run-init -c /dev/console /mnt /bin/bash -c \ - "/preinit ; . /include ; cleanImage ; exec /sbin/init $option" + "/preinit ; . /include ; cleanImage ; exec $init $option" else cd /mnt && exec chroot . /bin/bash -c \ - "/preinit ; . /include ; cleanImage ; exec /sbin/init $option" + "/preinit ; . /include ; cleanImage ; exec $init $option" fi } #====================================== @@ -5733,9 +5699,6 @@ # underscores. current bootloaders show the # underscore sign as as space in the boot menu # --- - if [ -z "$loader" ];then - loader="grub" - fi if [ ! $loader = "syslinux" ] && [ ! $loader = "extlinux" ];then echo $1 | tr " " "_" else @@ -5915,9 +5878,6 @@ local en_GB=English local code local lang - if [ -f /.profile ];then - importFile < /.profile - fi if [ ! -z "$kiwi_oemunattended" ] && [ "$DIALOG_LANG" = "ask" ];then DIALOG_LANG=en_US fi @@ -7183,7 +7143,7 @@ # syslboot / luksboot #-------------------------------------- if [ -z "$bootid" ];then - test "$loader" = "syslinux" && pSearch=6 + test "$loader" = "syslinux" && pSearch=c for i in 4 3 2;do pType=$(partitionID $imageDiskDevice $i) if [ "$pType" = $pSearch ];then @@ -7588,6 +7548,15 @@ #-------------------------------------- function initialize { #====================================== + # Exports boot image .profile + #-------------------------------------- + if [ -f /.profile ];then + importFile < /.profile + if [ ! -z "$kiwi_bootloader" ];then + loader=$kiwi_bootloader + fi + fi + #====================================== # Check partitioner capabilities #-------------------------------------- if [ $PARTITIONER = "unsupported" ];then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2011-07-01 16:20:06.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2011-08-09 10:55:47.000000000 +0200 @@ -4180,7 +4180,9 @@ my $type = $element -> getAttribute("type"); my $source= $element -> getElementsByTagName("source") -> get_node(1) -> getAttribute ("path"); - $this -> addRepository ([$type],[$source]); + my $alias = $element -> getAttribute("alias"); + my $prio = $element -> getAttribute("priority"); + $this -> addRepository ([$type],[$source],[$alias],[$prio]); } } # 2) add those repos which are part of the changeset ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
