Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-03-06 13:38:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-02-25
07:30:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-03-06
13:38:14.000000000 +0100
@@ -1,0 +2,126 @@
+Mon Mar 5 15:21:08 CET 2012 - m...@suse.de
+
+- v5.02.17 released
+
+-------------------------------------------------------------------
+Mon Mar 5 13:01:13 CET 2012 - m...@suse.de
+
+- follow up fix for handling of console in kiwi initrd (bnc #749900)
+ * don't start blogd in kiwi initrd, doesn't make much sense
+ * fixed console output, stdout was wrongly redirected
+ * make sure utimer also works in the preinit code
+
+-------------------------------------------------------------------
+Mon Mar 5 10:38:34 CET 2012 - m...@suse.de
+
+- v5.02.16 released
+
+-------------------------------------------------------------------
+Mon Mar 5 10:23:55 CET 2012 - m...@suse.de
+
+- arm: fixed installation of MLO loader, wrong path
+
+-------------------------------------------------------------------
+Sun Mar 4 22:03:07 CET 2012 - m...@suse.de
+
+- arm: added following boot fixes:
+ * To avoid any issues when parted leaves x86 boot code we
+ zero out the first 440 bytes (MBR without ptable). The
+ mandatory master boot id to identify the device is written
+ afterwards
+ * make sure MLO is installed after repart again in
+ installBootLoaderUBoot. Also make sure the same MBR cleanup
+ code is applied in the kiwi boot code
+
+-------------------------------------------------------------------
+Fri Mar 2 16:26:01 CET 2012 - m...@suse.de
+
+- v5.02.15 released
+
+-------------------------------------------------------------------
+Fri Mar 2 15:32:47 CET 2012 - m...@suse.de
+
+- fixed handling of console in kiwi initrd (bnc #749900)
+ * removed use of klogconsole, we want kernel messages at that stage
+ * don't use tty devices, use /dev/console and remove kiwistderr
+ * allow debug shell only if tty device for it exists
+ * don't use extra terminal to show error information. all that
+ is stored in /var/log/boot kiwi
+
+-------------------------------------------------------------------
+Fri Mar 2 11:20:49 CET 2012 - m...@suse.de
+
+- added ec2region setup to ec2 example image descriptions
+
+-------------------------------------------------------------------
+Fri Mar 2 11:15:19 CET 2012 - m...@suse.de
+
+- DB: rebuild documentation
+
+-------------------------------------------------------------------
+Thu Mar 1 16:40:11 CET 2012 - m...@suse.de
+
+- fixed default fstab setup to know about /run for udev
+
+-------------------------------------------------------------------
+Thu Mar 1 16:33:46 CET 2012 - rjsch...@suse.de
+
+- update EC2 chapter
+ Include information about EC2 tools handling of regions, us-east-1 is the
+ default if not otherwise specified via EC2_URL, --url, or --region
+
+-------------------------------------------------------------------
+Thu Mar 1 15:02:10 CET 2012 - m...@suse.de
+
+- fixed initrd module list for ec2 format code
+
+-------------------------------------------------------------------
+Wed Feb 29 16:01:14 CET 2012 - m...@suse.de
+
+- further cleanup of ec2 examples
+
+-------------------------------------------------------------------
+Wed Feb 29 15:43:10 CET 2012 - m...@suse.de
+
+- cleanup ec2 examples
+
+-------------------------------------------------------------------
+Tue Feb 28 18:03:04 CET 2012 - m...@suse.de
+
+- netboot: fixed setup of root device for local boot
+
+-------------------------------------------------------------------
+Tue Feb 28 13:39:50 CET 2012 - m...@suse.de
+
+- added -base kernel packages for ec2 and xenk boot profiles
+
+-------------------------------------------------------------------
+Tue Feb 28 13:27:30 CET 2012 - m...@suse.de
+
+- fixed mkinitrd call in ec2 format code:
+ * don't use -A also make sure the exit code of mkinitrd is evaluated
+ * make sure all required filesystem modules are added to
+ /etc/sysconfig/kernel before calling mkinitrd
+
+-------------------------------------------------------------------
+Tue Feb 28 07:56:46 CET 2012 - m...@suse.de
+
+- respect size setup by user and don't add extra space for
+ a possible boot partition
+
+-------------------------------------------------------------------
+Mon Feb 27 11:58:12 CET 2012 - m...@suse.de
+
+- because the input stream from XML is utf-8 encoded it's required
+ to set binmode correctly to utf-8 too when writing the data out.
+ This is at least required for the profile file inside the initrd
+ because it contains data from the XML like the oem boot title
+
+-------------------------------------------------------------------
+Sun Feb 26 14:52:29 CET 2012 - m...@suse.de
+
+- changed partition alignment to align start and size of
+ partitions to 4096 bytes. The value can be changed with
+ the option --disk-alignment
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.0aGZ4A/_old 2012-03-06 13:38:16.000000000 +0100
+++ /var/tmp/diff_new_pack.0aGZ4A/_new 2012-03-06 13:38:16.000000000 +0100
@@ -22,7 +22,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.02.14
+Version: 5.02.17
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
++++++ kiwi-docu.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2
/work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1
++++++ 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 2012-02-23 16:23:38.000000000 +0100
+++ new/kiwi/.revision 2012-03-02 16:26:37.000000000 +0100
@@ -1 +1 @@
-d61db24c4c3aee961d2554636398e48fda1043f1
+de229f456ecadd7dfbcc408253808b79b48f4d08
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2012-02-23 16:23:38.000000000 +0100
+++ new/kiwi/kiwi.pl 2012-03-02 16:26:37.000000000 +0100
@@ -50,6 +50,11 @@
use KIWIGlobals;
#============================================
+# UTF-8 for output to stdout
+#--------------------------------------------
+binmode(STDOUT, ":utf8");
+
+#============================================
# Globals (debugging)
#--------------------------------------------
our $TT = "Trace Level ";
@@ -664,9 +669,8 @@
my $DiskStartSector; # location of start sector (default is 32)
my $EditBootConfig; # allow to run script before bootloader
install
my $PackageManager; # package manager to use
+ my $DiskAlignment; # partition alignment, default is 4096
my $DiskBIOSSectorSize; # sector size default is 512 bytes
- my $DiskBIOSHeads; # BIOS head number, overwrites kernel value
- my $DiskBIOSSectors; # BIOS sector number, overwrites kernel value
my $Version; # version information
#==========================================
# create logger and cmdline object
@@ -756,10 +760,9 @@
"upgrade|u=s" => \$Upgrade,
"test-image=s" => \$TestImage,
"test-case=s" => \$TestCase,
- "start-sector=i" => \$DiskStartSector,
- "bios-sector-size=i" => \$DiskBIOSSectorSize,
- "bios-heads=i" => \$DiskBIOSHeads,
- "bios-sectors=i" => \$DiskBIOSSectors,
+ "disk-start-sector=i" => \$DiskStartSector,
+ "disk-alignment=i" => \$DiskAlignment,
+ "disk-sector-size=i" => \$DiskBIOSSectorSize,
"v|verbose=i" => \$Verbosity,
"version" => \$Version,
"yes|y" => \$defaultAnswer,
@@ -783,6 +786,12 @@
$DiskBIOSSectorSize
);
#========================================
+ # set partition alignment
+ #----------------------------------------
+ $cmdL -> setDiskAlignment (
+ $DiskAlignment
+ );
+ #========================================
# set list of filesystem options
#----------------------------------------
$cmdL -> setFilesystemOptions (
@@ -796,18 +805,6 @@
\@Exclude,\@Skip,$MigrateNoFiles,$MigrateNoTemplate
);
#========================================
- # set BIOS heads for alignment
- #----------------------------------------
- if (defined $DiskBIOSHeads) {
- $cmdL -> setDiskBIOSHeads ($DiskBIOSHeads);
- }
- #========================================
- # set BIOS sectors for alignment
- #----------------------------------------
- if (defined $DiskBIOSSectors) {
- $cmdL -> setDiskBIOSSectors ($DiskBIOSSectors);
- }
- #========================================
# check if edit-bootconfig option is set
#----------------------------------------
if (defined $EditBootConfig) {
@@ -1420,23 +1417,19 @@
print " used architecture for the image-packages in zypp.conf.\n";
print " When used with smart this option doesn't have any
effect.\n";
print "\n";
- print " [ --start-sector <number> ]\n";
+ print " [ --disk-start-sector <number> ]\n";
print " The start sector value for virtual disk based images.\n";
print " The default is 2048. For newer disks including SSD\n";
print " this is a reasonable default. In order to use the old\n";
print " style disk layout the value can be set to 32\n";
print "\n";
- print " [ --bios-sector-size <number> ]\n";
+ print " [ --disk-sector-size <number> ]\n";
print " Overwrite the default 512 byte sector size value.\n";
print " This will influence the partition alignment\n";
print "\n";
- print " [ --bios-heads <number> ]\n";
- print " Overwrite what the kernel thinks about the number of
heads.\n";
- print " This will influence the partition alignment\n";
- print "\n";
- print " [ --bios-sectors <number> ]\n";
- print " Overwrite what the kernel thinks about the number of\n";
- print " sectors. This will influence the partition alignment\n";
+ print " [ --disk-alignment <number> ]\n";
+ print " Align the start of each partition to the specified\n";
+ print " value. By default 4096 bytes are used\n";
print "\n";
print " [ --debug ]\n";
print " Prints a stack trace in case of internal errors\n";
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 2012-02-24 14:24:19.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2012-03-05 10:39:10.000000000 +0100
@@ -1825,7 +1825,7 @@
#==========================================
# Update raw disk size if boot part is used
#------------------------------------------
- if (($needBootP) && ($imgtype ne "split")) {
+ if ((! $this->{sizeSetByUser}) && ($needBootP) && ($imgtype ne
"split")) {
$this -> __updateDiskSize ($bootsize);
}
#==========================================
@@ -4557,9 +4557,9 @@
#==========================================
# install MLO as raw
#------------------------------------------
- if (-e "/mnt/MLO") {
+ if (-e "$tmpdir/boot/MLO") {
$kiwi -> info ("Installing MLO on device: $diskname");
- my $MLO = "/mnt/MLO";
+ my $MLO = "$tmpdir/boot/MLO";
my $opt = "count=1 seek=1 conv=notrunc";
$status = qxx (
"dd if=$MLO of=$diskname bs=128k $opt 2>&1"
@@ -4573,6 +4573,20 @@
$this -> cleanLoop ();
return;
}
+ # To avoid any issues when parted leaves x86 boot code
+ # in the MBR we better clear that part of the image
+ $status = qxx (
+ "dd if=/dev/zero of=$diskname bs=440 count=1
conv=notrunc 2>&1"
+ );
+ $result = $? >> 8;
+ if ($result != 0) {
+ $kiwi -> failed ();
+ $kiwi -> error ("Couldn't clear MBR on
$diskname: $status");
+ $kiwi -> failed ();
+ qxx ("umount /mnt 2>&1");
+ $this -> cleanLoop ();
+ return;
+ }
}
qxx ("umount /mnt 2>&1");
}
@@ -4704,14 +4718,6 @@
my $kiwi = $this->{kiwi};
my $cmdL = $this->{cmdL};
my $secsz = $cmdL -> getDiskBIOSSectorSize();
- my $BIOS_geo_head = $cmdL -> getDiskBIOSHeads();
- my $BIOS_geo_sector = $cmdL -> getDiskBIOSSectors();
- # ...
- # add +1 to the BIOS values to stay compatible with what
- # fdisk does. Important for the disk layout on arm
- # ---
- $BIOS_geo_head++;
- $BIOS_geo_sector++;
my $status;
my $result;
my $parted;
@@ -4729,23 +4735,6 @@
$kiwi -> loginfo ($status);
return 0;
}
- if ((! $BIOS_geo_head) || (! $BIOS_geo_sector)) {
- $parted = "$parted_exec $disk unit cyl print";
- $status = qxx ("$parted | grep ^BIOS 2>&1");
- $result = $? >> 8;
- if ($result != 0) {
- $kiwi -> loginfo ($status);
- return 0;
- }
- chomp $status;
- if ($status =~ /geometry:.*,(\d+),(\d+)\./) {
- $BIOS_geo_head = $1;
- $BIOS_geo_sector = $2;
- } else {
- $kiwi -> loginfo ("Failed to read BIOS cyl,head,sector
geometry\n");
- return 0;
- }
- }
$parted = "$parted_exec -m $disk unit s print";
$status = qxx (
"$parted | head -n 3 | tail -n 1 | cut -f2 -d:"
@@ -4759,14 +4748,9 @@
$status =~ s/s//;
$status --;
$this->{pDiskSectors} = $status;
- $this->{pDiskCylSize} = $BIOS_geo_head * $BIOS_geo_sector * $secsz;
$kiwi -> loginfo (
"Disk Sector count is: $this->{pDiskSectors}\n"
);
- my $eq = $BIOS_geo_head.' * '.$BIOS_geo_sector.' * '.$secsz;
- $kiwi -> loginfo (
- "Disk Cylinder size is: ($eq) $this->{pDiskCylSize} Bytes\n"
- );
return $status;
}
@@ -4776,14 +4760,15 @@
sub getSector {
# ...
# turn the given size in MB to the number of
- # required sectors aligned to the cylinder
- # boundary
+ # required sectors aligned to the value of
+ # getDiskAlignment (default 4MB)
# ----
my $this = shift;
my $size = shift;
+ my $cmdL = $this->{cmdL};
my $count = $this->{pDiskSectors};
- my $cylsz = $this->{pDiskCylSize};
- my $secsz = $this->{gdata}->{DiskSectorSize};
+ my $secsz = $cmdL->getDiskBIOSSectorSize();
+ my $align = $cmdL->getDiskAlignment();
my $sectors;
if ($size =~ /\+(.*)M$/) {
# turn value into bytes
@@ -4792,11 +4777,11 @@
# use entire rest space
$size = $count * $secsz;
}
- if ($size < $cylsz) {
- $size = $cylsz;
+ if ($size < $align) {
+ $size = $align;
}
- $size = int ($size / $cylsz);
- $size *= $cylsz;
+ $size = int ($size / $align);
+ $size *= $align;
$sectors = sprintf ("%.0f",$size / $secsz);
$sectors-= 1;
return $sectors;
@@ -4826,8 +4811,8 @@
# value from the global space or to the value specified on
# the commandline. On any subsequent call the start sector is
# calculated from the end sector of the previos partition
- # and the new value gets aligned to be modulo 8 clean. The
- # function returns the number of sectors which represents
+ # and the new value gets aligned to the value of getDiskAlignment
+ # The function returns the number of sectors which represents
# the given size
# ---
my $this = shift;
@@ -4835,6 +4820,9 @@
my $size = shift;
my $kiwi = $this->{kiwi};
my $cmdL = $this->{cmdL};
+ my $align = $cmdL->getDiskAlignment();
+ my $secsz = $cmdL->getDiskBIOSSectorSize();
+ my $align_sectors = int ($align / $secsz);
my $locator= new KIWILocator($kiwi);
if (! defined $this->{pStart}) {
$this->{pStart} = $cmdL->getDiskStartSector();
@@ -4846,9 +4834,11 @@
"$parted | grep :$this->{pStart} | cut -f3 -d:"
);
$status=~ s/s//;
- $status = int ($status / 8);
- $status*= 8;
- $status+= 8;
+ if ($status >= $align_sectors) {
+ $status = int ($status / $align_sectors);
+ $status*= $align_sectors;
+ $status+= $align_sectors;
+ }
$this->{pStart} = $status;
}
my $sector = $this -> getSector ($size);
@@ -5695,6 +5685,7 @@
#===========================================
# turn optional size from cmdline into bytes
#-------------------------------------------
+ $this->{sizeSetByUser} = 0;
if ($cmdlsize =~ /^(\d+)([MG])$/i) {
my $value= $1;
my $unit = $2;
@@ -5716,6 +5707,7 @@
$kiwi -> oops();
}
$minBytes = $cmdlBytes;
+ $this->{sizeSetByUser} = 1;
} elsif ($XMLBytes > 0) {
if ($XMLBytes < $minBytes) {
$kiwi -> warning (
@@ -5723,6 +5715,7 @@
);
$kiwi -> oops();
}
+ $this->{sizeSetByUser} = 1;
$minBytes = $XMLBytes;
}
#==========================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWICommandLine.pm
new/kiwi/modules/KIWICommandLine.pm
--- old/kiwi/modules/KIWICommandLine.pm 2012-02-23 16:23:38.000000000 +0100
+++ new/kiwi/modules/KIWICommandLine.pm 2012-03-02 16:26:37.000000000 +0100
@@ -1335,39 +1335,24 @@
}
#==========================================
-# setDiskBIOSHeads
+# setDiskAlignment
#------------------------------------------
-sub setDiskBIOSHeads {
+sub setDiskAlignment {
my $this = shift;
my $value = shift;
- $this->{BIOSHeads} = $value;
+ if (! defined $value) {
+ $value = $this->{gdata}->{DiskAlignment};
+ }
+ $this->{PTableAlignment} = $value;
return 1;
}
#==========================================
-# getDiskBIOSHeads
+# getDiskAlignment
#------------------------------------------
-sub getDiskBIOSHeads {
+sub getDiskAlignment {
my $this = shift;
- return $this->{BIOSHeads};
-}
-
-#==========================================
-# setDiskBIOSSectors
-#------------------------------------------
-sub setDiskBIOSSectors {
- my $this = shift;
- my $value = shift;
- $this->{BIOSSectors} = $value;
- return 1;
-}
-
-#==========================================
-# getDiskBIOSSectors
-#------------------------------------------
-sub getDiskBIOSSectors {
- my $this = shift;
- return $this->{BIOSSectors};
+ return $this->{PTableAlignment};
}
#==========================================
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 2012-02-24 14:24:19.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2012-03-05 15:21:28.000000000 +0100
@@ -42,7 +42,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.02.14";
+ $data{Version} = "5.02.17";
$data{Publisher} = "SUSE LINUX Products GmbH";
$data{Preparer} = "KIWI - http://kiwi.berlios.de";;
$data{ConfigName} = "config.xml";
@@ -51,6 +51,7 @@
$data{FSInodeSize} = 256;
$data{DiskStartSector} = 2048;
$data{DiskSectorSize} = 512;
+ $data{DiskAlignment} = 4096;
$data{SnapshotChunk} = 4096;
$data{SnapshotCount} = "5G";
$data{OverlayRootTree} = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm
new/kiwi/modules/KIWIImageFormat.pm
--- old/kiwi/modules/KIWIImageFormat.pm 2012-02-23 16:23:38.000000000 +0100
+++ new/kiwi/modules/KIWIImageFormat.pm 2012-03-02 16:26:42.000000000 +0100
@@ -370,6 +370,9 @@
my $source = $this->{image};
my $format = $this->{format};
my $target = $source;
+ my $mods = "ext3 jbd xenblk";
+ my $kmod = "INITRD_MODULES";
+ my $sysk = "/etc/sysconfig/kernel";
my $aminame= basename $source;
my $destdir= dirname $source;
my $status;
@@ -492,8 +495,15 @@
print $FD 'export rootdev=/dev/sda1'."\n";
print $FD 'export rootfstype='.$type{type}."\n";
print $FD 'mknod /dev/sda1 b 8 1'."\n";
- print $FD 'mkinitrd -B -A'."\n";
print $FD 'touch /boot/.rebuild-initrd'."\n";
+ print $FD 'sed -i -e \'s@^';
+ print $FD $kmod;
+ print $FD '="\(.*\)"@'.$kmod.'="\1 ';
+ print $FD $mods;
+ print $FD '"@\' ';
+ print $FD $sysk;
+ print $FD "\n";
+ print $FD 'mkinitrd -B'."\n";
close $FD;
qxx ("chmod u+x $tmpdir/create_initrd.sh");
$status = qxx ("chroot $tmpdir bash -c ./create_initrd.sh 2>&1");
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 2012-02-23 16:23:38.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-03-05 15:21:28.000000000 +0100
@@ -30,31 +30,17 @@
export bootLoaderOK=0
#======================================
-# Exports (arch specific)
+# Exports (console)
#--------------------------------------
-arch=`uname -m`
-if [ "$arch" = "ppc64" ];then
- test -z "$loader" && export loader=yaboot
- test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/hvc0
- test -z "$ELOG_CONSOLE" && export ELOG_CONSOLE=/dev/hvc0
-elif [[ $arch =~ arm ]];then
- test -z "$loader" && export loader=uboot
- test -z "$ELOG_CONSOLE" && export ELOG_CONSOLE=/dev/tty3
- test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/tty2
-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
+test -z $ELOG_BOOTSHELL && export ELOG_BOOTSHELL=/dev/tty2
+test -z $ELOG_EXCEPTION && export ELOG_EXCEPTION=/dev/console
#======================================
# Exports (General)
#--------------------------------------
+test -z "$arch" && export arch=$(uname -m)
test -z "$haveDASD" && export haveDASD=0
test -z "$haveZFCP" && export haveZFCP=0
-test -z "$ELOG_EXCEPTION" && export ELOG_EXCEPTION=/dev/tty1
-test -z "$KLOG_CONSOLE" && export KLOG_CONSOLE=4
-test -z "$KLOG_DEFAULT" && export KLOG_DEFAULT=1
test -z "$ELOG_STOPPED" && export ELOG_STOPPED=0
test -z "$PARTITIONER" && export PARTITIONER=parted
test -z "$DEFAULT_VGA" && export DEFAULT_VGA=0x314
@@ -67,10 +53,6 @@
test -z "$PARTED_HAVE_ALIGN" && export PARTED_HAVE_ALIGN=0
test -z "$PARTED_HAVE_MACHINE"&& export PARTED_HAVE_MACHINE=0
test -z "$DHCPCD_HAVE_PERSIST"&& export DHCPCD_HAVE_PERSIST=1
-if [ -x /sbin/blogd ];then
- test -z "$CONSOLE" && export CONSOLE=/dev/console
- test -z "$REDIRECT" && export REDIRECT=/dev/tty1
-fi
if which parted &>/dev/null;then
if parted -h | grep -q '\-\-align';then
export PARTED_HAVE_ALIGN=1
@@ -174,50 +156,6 @@
fi
}
#======================================
-# closeKernelConsole
-#--------------------------------------
-function closeKernelConsole {
- # /.../
- # close the kernel console, set level to 1
- # ----
- if [ -x /usr/sbin/klogconsole ];then
- klogconsole -l 1
- fi
-}
-#======================================
-# openKernelConsole
-#--------------------------------------
-function openKernelConsole {
- # /.../
- # move the kernel console to terminal 3 as you can't see the messages
- # now directly it looks like the kernel console is switched off
- # but it isn't really. If DEBUG is set the logging remains on
- # the first console
- # ----
- if [ ! -x /usr/sbin/klogconsole ];then
- return
- fi
- if test "$DEBUG" = 0;then
- Echo "Kernel logging enabled on: /dev/tty$KLOG_CONSOLE"
- setctsid /dev/tty$KLOG_CONSOLE \
- klogconsole -l 7 -r$KLOG_CONSOLE
- fi
-}
-#======================================
-# reopenKernelConsole
-#--------------------------------------
-function reopenKernelConsole {
- # /.../
- # reopen kernel console to be able to see kernel messages
- # while the system is booting
- # ----
- if [ ! -x /usr/sbin/klogconsole ];then
- return
- fi
- Echo "Kernel logging enabled on: /dev/tty$KLOG_DEFAULT"
- klogconsole -l 7 -r$KLOG_DEFAULT
-}
-#======================================
# importFile
#--------------------------------------
function importFile {
@@ -541,8 +479,8 @@
#--------------------------------------
function errorLogStart {
# /.../
- # Log all errors up to now to the terminal specified
- # by ELOG_CONSOLE
+ # Log all errors and the bas debug information to the
+ # file set in ELOG_FILE.
# ----
if [ ! -f $ELOG_FILE ];then
#======================================
@@ -555,22 +493,22 @@
#--------------------------------------
startUtimer
echo "KIWI PreInit Log" >> $ELOG_FILE
- cat /iprocs | grep -v TAIL_PID > /iprocs
fi
- echo "Boot-Logging enabled on $ELOG_CONSOLE"
- setctsid -f $ELOG_CONSOLE tail -f $ELOG_FILE &
- exec 2>>$ELOG_FILE
+ #======================================
+ # Contents of .profile environment
+ #--------------------------------------
if [ -f .profile ];then
- echo "KIWI .profile contents:" 1>&2
- cat .profile 1>&2
- fi
- set -x 1>&2
- local DTYPE=`stat -f -c "%T" /proc 2>/dev/null`
- if test "$DTYPE" != "proc" ; then
- mount -t proc proc /proc
+ echo "KIWI .profile contents:" >> $ELOG_FILE
+ cat .profile >> $ELOG_FILE
fi
- TAIL_PID=$(fuser $ELOG_CONSOLE | tr -d " ")
- echo TAIL_PID=$TAIL_PID >> /iprocs
+ #======================================
+ # Redirect stderr to ELOG_FILE
+ #--------------------------------------
+ exec 2>>$ELOG_FILE
+ #======================================
+ # Enable shell debugging and redirect
+ #--------------------------------------
+ set -x
}
#======================================
# udevPending
@@ -700,40 +638,6 @@
fi
}
#======================================
-# startBlogD
-#--------------------------------------
-function startBlogD {
- if test -n "$REDIRECT" ; then
- mkdir -p /var/log
- > /dev/shm/initrd.msg
- ln -sf /dev/shm/initrd.msg /var/log/boot.msg
- mkdir -p /var/run
- startproc /sbin/blogd $REDIRECT
- BLOGD_PID=$(pidof /sbin/blogd)
- echo BLOGD_PID=$BLOGD_PID >> /iprocs
- fi
-}
-#======================================
-# killBlogD
-#--------------------------------------
-function killBlogD {
- # /.../
- # kill blogd on /dev/console
- # ----
- if test -n "$REDIRECT" ; then
- local umountProc=0
- if [ ! -e /proc/mounts ];then
- mount -t proc proc /proc
- umountProc=1
- fi
- Echo "Stopping boot logging"
- . /iprocs ; kill $BLOGD_PID
- if [ $umountProc -eq 1 ];then
- umount /proc
- fi
- fi
-}
-#======================================
# installBootLoader
#--------------------------------------
function installBootLoader {
@@ -801,11 +705,33 @@
#--------------------------------------
function installBootLoaderUBoot {
if [ -x /usr/bin/mkimage ];then
+ #======================================
+ # create u-boot script and image
+ #--------------------------------------
mkimage -A arm -O linux -a 0 -e 0 -T script -C none \
-n 'Boot-Script' -d /boot/boot.script /boot/boot.scr
if [ ! $? = 0 ];then
Echo "Failed to create boot script image"
fi
+ #======================================
+ # install MLO
+ #--------------------------------------
+ if [ -e /boot/MLO ];then
+ dd if=/boot/MLO of=$imageDiskDevice bs=128k count=1
seek=1 1>&2
+ if [ ! $? = 0 ];then
+ Echo "Failed to install MLO"
+ fi
+ else
+ Echo "No MLO loader present in system image"
+ Echo "Install of MLO skipped"
+ fi
+ #======================================
+ # avoid x86 boot code in the MBR
+ #--------------------------------------
+ dd if=/dev/zero of=$imageDiskDevice bs=440 count=1 1>&2
+ if [ ! $? = 0 ];then
+ Echo "Failed to clear MBR"
+ fi
else
Echo "Image doesn't have u-boot-tools installed"
Echo "Can't create boot script image"
@@ -2496,6 +2422,7 @@
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
}
#======================================
# updateRootDeviceFstab
@@ -4420,10 +4347,6 @@
if [ ! -z "$kiwibrokenmodule" ];then
kiwibrokenmodule=`echo $kiwibrokenmodule | tr , " "`
fi
- if [ ! -z "$kiwistderr" ];then
- export ELOG_CONSOLE=$kiwistderr
- export ELOG_EXCEPTION=$kiwistderr
- fi
if [ ! -z "$ramdisk_size" ];then
local modfile=/etc/modprobe.d/99-local.conf
if [ ! -f $modfile ];then
@@ -5185,7 +5108,11 @@
# /.../
# start a debugging shell on ELOG_BOOTSHELL
# ----
- if [ -z "$kiwistderr" ] && [ ! -z $kiwidebug ];then
+ if [ ! -z $kiwidebug ];then
+ if [ ! -e $ELOG_BOOTSHELL ];then
+ Echo "No terminal $ELOG_BOOTSHELL available for debug
shell"
+ return
+ fi
Echo "Starting boot shell on $ELOG_BOOTSHELL"
setctsid -f $ELOG_BOOTSHELL /bin/bash -i
ELOGSHELL_PID=$(fuser $ELOG_BOOTSHELL | tr -d " ")
@@ -5781,8 +5708,9 @@
# move device nodes
#--------------------------------------
Echo "Activating Image: [$name]"
- reopenKernelConsole
udevPending
+ mkdir -p /mnt/run
+ mkdir -p /mnt/dev
mount --move /dev /mnt/dev
mount --move /run /mnt/run
udevKill
@@ -5790,6 +5718,9 @@
# run preinit stage
#--------------------------------------
Echo "Preparing preinit phase..."
+ if ! cp /usr/bin/utimer /mnt;then
+ systemException "Failed to copy utimer code" "reboot"
+ fi
if ! cp /iprocs /mnt;then
systemException "Failed to copy iprocs code" "reboot"
fi
@@ -5822,7 +5753,6 @@
#--------------------------------------
. /iprocs
kill $UTIMER_PID &>/dev/null
- kill $TAIL_PID &>/dev/null
#======================================
# remove preinit code from system image
#--------------------------------------
@@ -5936,7 +5866,6 @@
#--------------------------------------
. /iprocs
kill $UTIMER_PID &>/dev/null
- kill $TAIL_PID &>/dev/null
#======================================
# copy boot log file into system image
#--------------------------------------
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 2012-02-23 16:23:38.000000000 +0100
+++ new/kiwi/modules/KIWIRoot.pm 2012-03-02 16:26:37.000000000 +0100
@@ -1050,6 +1050,7 @@
}
$kiwi -> done();
my %config = $xml -> getImageConfig();
+ binmode($FD, ":utf8");
foreach my $key (keys %config) {
$kiwi -> loginfo ("[PROFILE]: $key=\"$config{$key}\"\n");
print $FD "$key=\"$config{$key}\"\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc
new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc
--- old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -155,7 +155,6 @@
if [ ! -z "$OEM_SILENTBOOT" ];then
test -e /proc/splash && echo verbose > /proc/splash
fi
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -188,10 +187,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -641,7 +638,6 @@
# 25) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 26) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc
new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -78,7 +78,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -107,10 +106,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -273,7 +270,6 @@
# 21) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 22) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc
new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc
--- old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -53,7 +53,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) probe for livecd_config in cmdline
@@ -77,10 +76,8 @@
#======================================
# 5) start boot shell and logging
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -298,7 +295,6 @@
# 19) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 20) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-linuxrc
new/kiwi/system/boot/ix86/isoboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -53,7 +53,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) probe for livecd_config in cmdline
@@ -77,10 +76,8 @@
#======================================
# 5) start boot shell and logging
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -296,7 +293,6 @@
# 19) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 20) Activate new root
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 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -75,7 +75,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -105,10 +104,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) probe/load network module
@@ -587,9 +584,7 @@
# 15.2) Check for local boot
#--------------------------------------
if [ $LOCAL_BOOT = "yes" ];then
- imageDisk=$(dn $root)
- imageDevice=$(ddn $imageDisk 2)
- imageRootDevice=$imageDevice
+ imageRootDevice=$root
imageRootName="Local-System"
if [ ! -z "$UNIONFS_CONFIG" ];then
unionFST=$UNIONFS_CONFIG
@@ -1045,7 +1040,6 @@
# 30) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 31) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc
new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc
--- old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -155,7 +155,6 @@
if [ ! -z "$OEM_SILENTBOOT" ];then
test -e /proc/splash && echo verbose > /proc/splash
fi
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -188,10 +187,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -641,7 +638,6 @@
# 25) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 26) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml
new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2012-03-02
16:26:37.000000000 +0100
@@ -93,10 +93,12 @@
</packages>
<packages type="image" profiles="xenk">
<package name="kernel-xen"/>
+ <package name="kernel-xen-base"/>
<package name="xen"/>
</packages>
<packages type="image" profiles="ec2">
<package name="kernel-ec2"/>
+ <package name="kernel-ec2-base"/>
</packages>
<packages type="image" profiles="rt">
<package name="kernel-rt"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml
new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2012-03-02
16:26:37.000000000 +0100
@@ -94,11 +94,15 @@
</packages>
<packages type="image" profiles="xenk">
<package name="kernel-xen"/>
+ <package name="kernel-xen-base"/>
<!-- xen dom0 support only on x86_64 -->
<package name="xen" arch="x86_64"/>
</packages>
<packages type="image" profiles="ec2">
<package name="kernel-ec2"/>
+ <package name="kernel-ec2-base"/>
+<!-- xen dom0 support only on x86_64 -->
+ <package name="xen" arch="x86_64"/>
</packages>
<packages type="image" profiles="rt">
<package name="kernel-rt"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc
new/kiwi/system/boot/ix86/oemboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -155,7 +155,6 @@
if [ ! -z "$OEM_SILENTBOOT" ];then
test -e /proc/splash && echo verbose > /proc/splash
fi
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -188,10 +187,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -641,7 +638,6 @@
# 25) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 26) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc
new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc
--- old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -78,7 +78,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -107,10 +106,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -273,7 +270,6 @@
# 21) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 22) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml
new/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml 2012-03-02
16:26:37.000000000 +0100
@@ -81,10 +81,12 @@
</packages>
<packages type="image" profiles="xenk">
<package name="kernel-xen"/>
+ <package name="kernel-xen-base"/>
<package name="xen"/>
</packages>
<packages type="image" profiles="ec2">
<package name="kernel-ec2"/>
+ <package name="kernel-ec2-base"/>
</packages>
<packages type="image" profiles="desktop">
<package name="kernel-desktop"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml
new/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml 2012-03-02
16:26:37.000000000 +0100
@@ -82,11 +82,15 @@
</packages>
<packages type="image" profiles="xenk">
<package name="kernel-xen"/>
+ <package name="kernel-xen-base"/>
<!-- xen dom0 support only on x86_64 -->
<package name="xen" arch="x86_64"/>
</packages>
<packages type="image" profiles="ec2">
<package name="kernel-ec2"/>
+ <package name="kernel-ec2-base"/>
+<!-- xen dom0 support only on x86_64 -->
+ <package name="xen" arch="x86_64"/>
</packages>
<packages type="image" profiles="desktop">
<package name="kernel-desktop"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc
new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -78,7 +78,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -107,10 +106,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -273,7 +270,6 @@
# 21) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 22) Activate new root
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 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -75,7 +75,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -105,10 +104,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) probe/load network module
@@ -587,9 +584,7 @@
# 15.2) Check for local boot
#--------------------------------------
if [ $LOCAL_BOOT = "yes" ];then
- imageDisk=$(dn $root)
- imageDevice=$(ddn $imageDisk 2)
- imageRootDevice=$imageDevice
+ imageRootDevice=$root
imageRootName="Local-System"
if [ ! -z "$UNIONFS_CONFIG" ];then
unionFST=$UNIONFS_CONFIG
@@ -1045,7 +1040,6 @@
# 30) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 31) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-linuxrc
new/kiwi/system/boot/ppc/oemboot/suse-linuxrc
--- old/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -155,7 +155,6 @@
if [ ! -z "$OEM_SILENTBOOT" ];then
test -e /proc/splash && echo verbose > /proc/splash
fi
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -188,10 +187,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -641,7 +638,6 @@
# 25) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 26) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc
new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2012-03-05
15:21:28.000000000 +0100
@@ -78,7 +78,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -107,10 +106,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -274,7 +271,6 @@
# 21) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 22) Activate new root
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 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2012-03-05
15:21:29.000000000 +0100
@@ -87,7 +87,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -117,10 +116,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) probe/load network module
@@ -603,9 +600,7 @@
# 15.2) Check for local boot
#--------------------------------------
if [ $LOCAL_BOOT = "yes" ];then
- imageDisk=$(dn $root)
- imageDevice=$(ddn $imageDisk 2)
- imageRootDevice=$imageDevice
+ imageRootDevice=$root
imageRootName="Local-System"
if [ ! -z "$UNIONFS_CONFIG" ];then
unionFST=$UNIONFS_CONFIG
@@ -1053,7 +1048,6 @@
# 29) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 30) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc
new/kiwi/system/boot/s390/oemboot/suse-linuxrc
--- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2012-03-05
15:21:29.000000000 +0100
@@ -155,7 +155,6 @@
if [ ! -z "$OEM_SILENTBOOT" ];then
test -e /proc/splash && echo verbose > /proc/splash
fi
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -188,10 +187,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -645,7 +642,6 @@
# 25) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 26) Activate new root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-linuxrc
new/kiwi/system/boot/s390/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2012-02-23
16:23:38.000000000 +0100
+++ new/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2012-03-05
15:21:29.000000000 +0100
@@ -78,7 +78,6 @@
# 1) Mounting local file systems
#--------------------------------------
mountSystemFilesystems &>/dev/null
-closeKernelConsole
#======================================
# 2) Prepare module load support
@@ -107,10 +106,8 @@
#======================================
# 5) start boot shell
#--------------------------------------
-startBlogD
startShell
errorLogStart
-openKernelConsole
#======================================
# 6) Including required kernel modules
@@ -277,7 +274,6 @@
# 21) kill boot shell
#--------------------------------------
killShell
-killBlogD
#======================================
# 22) Activate new root
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
