Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-02-20 16:13:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-17
12:00:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-02-20
16:13:44.000000000 +0100
@@ -1,0 +2,22 @@
+Fri Feb 17 15:43:56 CET 2012 - m...@suse.de
+
+- v5.02.11 released
+
+-------------------------------------------------------------------
+Fri Feb 17 15:41:46 CET 2012 - m...@suse.de
+
+- deactivate volume groups always with their name as argument
+- fixed setDefaultDeviceMap to respect device naming conventions
+
+-------------------------------------------------------------------
+Fri Feb 17 14:38:13 CET 2012 - m...@suse.de
+
+- finally fixed setupBootPartition in a clean way. kiwi creates
+ a volume label named 'BOOT' if a boot partition is used.
+ setupBootPartition searches for the label and setup the boot
+ partition accordingly. Along with the change the functions
+ update*BootDeviceFstab and resetBootBind were also adapted.
+ There is now only one updateBootDeviceFstab handling the
+ boot partition entry for all modes if required
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.FG7A3E/_old 2012-02-20 16:13:46.000000000 +0100
+++ /var/tmp/diff_new_pack.FG7A3E/_new 2012-02-20 16:13:46.000000000 +0100
@@ -22,7 +22,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.02.10
+Version: 5.02.11
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2012-02-16 16:06:13.000000000 +0100
+++ new/kiwi/.revision 2012-02-16 16:06:13.000000000 +0100
@@ -1 +1 @@
-776d21aae9b4840397298ae5f922be873bc91600
+2a8bc5066d9e277263621bf64c9c521c396d90c0
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-16 16:06:18.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2012-02-17 15:47:20.000000000 +0100
@@ -781,7 +781,11 @@
$kiwi -> info ("Using disk device: $haveDiskDevice");
$this->{loop} = $haveDiskDevice;
$this->{bindloop} = $haveDiskDevice;
- qxx ("vgchange -a y 2>&1");
+ my $devcopy = $this->{bindloop};
+ my $lastc = chop $devcopy;
+ if ($lastc =~ /\d/) {
+ $this->{bindloop} = $haveDiskDevice."p";
+ }
$kiwi -> done();
}
#==========================================
@@ -1157,7 +1161,11 @@
$kiwi -> info ("Using disk device: $haveDiskDevice");
$this->{loop} = $haveDiskDevice;
$this->{bindloop} = $haveDiskDevice;
- qxx ("vgchange -a y 2>&1");
+ my $devcopy = $this->{bindloop};
+ my $lastc = chop $devcopy;
+ if ($lastc =~ /\d/) {
+ $this->{bindloop} = $haveDiskDevice."p";
+ }
$kiwi -> done();
}
#==========================================
@@ -2236,9 +2244,9 @@
if ($bootloader =~ /syslinux|yaboot/) {
$kiwi -> info ("Creating DOS boot filesystem");
if ($bootloader eq "yaboot") {
- $status = qxx ("/sbin/mkdosfs -F 16 $boot
2>&1");
+ $status = qxx ("/sbin/mkdosfs -F 16 -n 'BOOT'
$boot 2>&1");
} else {
- $status = qxx ("/sbin/mkdosfs -F 32 -n 'boot'
$boot 2>&1");
+ $status = qxx ("/sbin/mkdosfs -F 32 -n 'BOOT'
$boot 2>&1");
}
$result = $? >> 8;
if ($result != 0) {
@@ -2256,7 +2264,7 @@
);
my $fsopts = $FSopts{ext3};
my $fstool = "mkfs.ext3";
- $status = qxx ("$fstool $fsopts $boot 2>&1");
+ $status = qxx ("$fstool -L 'BOOT' $fsopts $boot 2>&1");
$result = $? >> 8;
if ($result != 0) {
$kiwi -> failed ();
@@ -2596,9 +2604,6 @@
my $loopdir= $this->{loopdir};
$main::global -> umount();
if ((defined $loop) && ($loop =~ /loop/)) {
- if (defined $lvm) {
- qxx ("vgchange -an 2>&1");
- }
$this -> cleanLoopMaps();
qxx ("/sbin/losetup -d $loop 2>&1");
undef $this->{loop};
@@ -2613,12 +2618,21 @@
my $this = shift;
my $dev = shift;
my $loop = $this->{loop};
+ my $lvm = $this->{lvm};
if ($dev) {
$loop = $dev;
}
if ($loop =~ /dev\/(.*)/) {
$loop = $1;
}
+ if ($lvm) {
+ my $dev = "/dev/mapper/".$loop."p2";
+ if (-e $dev) {
+ my $vgname = qxx ("pvs --noheadings -o vg_name $dev
2>/dev/null");
+ chomp $vgname;
+ qxx ("vgchange -an $vgname 2>&1");
+ }
+ }
foreach my $d (glob ("/dev/mapper/$loop*")) {
qxx ("dmsetup remove $d 2>&1");
}
@@ -4299,7 +4313,7 @@
$status = qxx ("umount /mnt 2>&1");
}
if ($device =~ /mapper/) {
- $this -> cleanLoopMaps ($diskname);
+ $this -> cleanLoopMaps ();
}
if ($result != 0) {
$kiwi -> failed ();
@@ -4977,8 +4991,14 @@
if (! defined $device) {
return;
}
+ my $devcopy= $device;
+ my $lastc = chop $devcopy;
for (my $i=1;$i<=3;$i++) {
- $result{$i} = $device.$i;
+ if ($lastc =~ /\d/) {
+ $result{$i} = $device."p".$i;
+ } else {
+ $result{$i} = $device.$i;
+ }
}
return %result;
}
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-16 16:06:18.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2012-02-17 15:47:20.000000000 +0100
@@ -42,7 +42,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.02.10";
+ $data{Version} = "5.02.11";
$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 2012-02-16 16:06:18.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-02-17 15:47:20.000000000 +0100
@@ -2558,18 +2558,20 @@
echo "$diskByID swap swap defaults 0 0" >> $nfstab
}
#======================================
-# updateLVMBootDeviceFstab
+# updateBootDeviceFstab
#--------------------------------------
-function updateLVMBootDeviceFstab {
+function updateBootDeviceFstab {
# /.../
- # add one line to the fstab file for the /lvmboot
- # device partition
+ # add temporary bind mounted boot entry to fstab
# ----
local prefix=$1
local sdev=$2
- local mount=$3
- if [ -z "$mount" ];then
- mount=/lvmboot
+ local mount=boot_bind
+ #======================================
+ # Return if no action required
+ #--------------------------------------
+ if [ ! -e /mnt/$mount ];then
+ return
fi
local diskByID=`getDiskID $sdev`
local nfstab=$prefix/etc/fstab
@@ -2583,68 +2585,13 @@
if [ -z "$FSTYPE" ] || [ "$FSTYPE" = "unknown" ];then
FSTYPE="auto"
fi
- echo "$diskByID $mount $FSTYPE defaults 1 2" >> $nfstab
+ echo "$diskByID /$mount $FSTYPE defaults 1 2" >> $nfstab
echo "$mount/boot /boot none bind 0 0" >> $nfstab
if [ ! -z "$FSTYPE_SAVE" ];then
FSTYPE=$FSTYPE_SAVE
fi
}
#======================================
-# updateSplitBootDeviceFstab
-#--------------------------------------
-function updateSplitBootDeviceFstab {
- updateLVMBootDeviceFstab $1 $2 "/splitboot"
-}
-#======================================
-# updateClicBootDeviceFstab
-#--------------------------------------
-function updateClicBootDeviceFstab {
- updateLVMBootDeviceFstab $1 $2 "/clicboot"
-}
-#======================================
-# updateLuksBootDeviceFstab
-#--------------------------------------
-function updateLuksBootDeviceFstab {
- updateLVMBootDeviceFstab $1 $2 "/luksboot"
-}
-#======================================
-# updateBtrBootDeviceFstab
-#--------------------------------------
-function updateBtrBootDeviceFstab {
- updateLVMBootDeviceFstab $1 $2 "/btrboot"
-}
-#======================================
-# updateXfsBootDeviceFstab
-#--------------------------------------
-function updateXfsBootDeviceFstab {
- updateLVMBootDeviceFstab $1 $2 "/xfsboot"
-}
-#======================================
-# updateYaBootDeviceFstab
-#--------------------------------------
-function updateYaBootDeviceFstab {
- updateLVMBootDeviceFstab $1 $2 "/yaboot"
-}
-#======================================
-# updateSyslinuxBootDeviceFstab
-#--------------------------------------
-function updateSyslinuxBootDeviceFstab {
- # /.../
- # add one line to the fstab file for the /syslboot
- # device partition
- # ----
- local prefix=$1
- local sdev=$2
- local diskByID=`getDiskID $sdev`
- local nfstab=$prefix/etc/fstab
- if [ $loader = "syslinux" ];then
- echo "$diskByID /syslboot vfat defaults 1 2" >> $nfstab
- else
- echo "$diskByID /syslboot ext2 defaults 1 2" >> $nfstab
- fi
- echo "/syslboot/boot /boot none bind 0 0" >> $nfstab
-}
-#======================================
# updateOtherDeviceFstab
#--------------------------------------
function updateOtherDeviceFstab {
@@ -5864,6 +5811,7 @@
# remove preinit code from system image before real init
# is called
# ----
+ local bootdir=boot_bind
#======================================
# setup logging in this mode
#--------------------------------------
@@ -5927,14 +5875,9 @@
#======================================
# umount image boot partition if any
#--------------------------------------
- for i in \
- yaboot lvmboot btrboot clicboot xfsboot luksboot syslboot
splitboot
- do
- if [ ! -e /$i ];then
- continue
- fi
- umount /$i 1>&2
- done
+ if [ -e /$bootdir ];then
+ umount /$bootdir 1>&2
+ fi
umount /boot 1>&2
#======================================
# turn off swap
@@ -7706,94 +7649,58 @@
# setupBootPartition
#--------------------------------------
function setupBootPartition {
- local pSearch=83
- local mpoint
+ #======================================
+ # Variable setup
+ #--------------------------------------
+ local label=undef
+ local mpoint=boot_bind
+ local haveBootPartition=0
+ local FSTYPE_SAVE=$FSTYPE
+ local fs_type=undef
unset NETBOOT_ONLY
- if [ "$haveLVM" = "yes" ];then
- #======================================
- # lvmboot
- #--------------------------------------
- test -z "$bootid" && export bootid=1
- mpoint=lvmboot
- elif [ "$haveBtrFS" = "yes" ];then
- #======================================
- # btrboot
- #--------------------------------------
- test -z "$bootid" && export bootid=1
- mpoint=btrboot
- elif [ "$haveClicFS" = "yes" ];then
- #======================================
- # clicboot
- #--------------------------------------
- test -z "$bootid" && export bootid=1
- mpoint=clicboot
- elif [ "$haveXFS" = "yes" ];then
- #======================================
- # xfsboot
- #--------------------------------------
- test -z "$bootid" && export bootid=1
- mpoint=xfsboot
- elif [ ! -z "$COMBINED_IMAGE" ];then
- #======================================
- # splitboot
- #--------------------------------------
- test -z "$bootid" && export bootid=1
- mpoint=splitboot
- elif [ "$loader" = "yaboot" ];then
- #======================================
- # yaboot
- #--------------------------------------
- test -z "$bootid" && export bootid=1
- mpoint=yaboot
- elif \
- [ "$loader" = "syslinux" ] || \
- [ "$loader" = "extlinux" ] || \
- [ "$haveLuks" = "yes" ]
- then
- #======================================
- # syslboot / luksboot
- #--------------------------------------
- test -z "$bootid" && export bootid=1
- if [ "$haveLuks" = "yes" ];then
- local FSTYPE_SAVE=$FSTYPE
- probeFileSystem $(ddn $imageDiskDevice $bootid)
- if [ "$FSTYPE" = "luks" ]; then
- # /.../
- # ups, boot partition should not be luks encoded
- # unset bootid and hopefully handly it correctly
- # outside of this function
- # ----
- unset bootid
- else
- mpoint=luksboot
- fi
- FSTYPE=$FSTYPE_SAVE
- else
- mpoint=syslboot
- fi
- else
- #======================================
- # no separate boot partition
- #--------------------------------------
- if [ -z "$bootid" ];then
- export bootid=1
- fi
+ #======================================
+ # Check for boot partition
+ #--------------------------------------
+ if [ -z "$imageDiskDevice" ];then
+ # no disk device like for live ISO based on clicfs
return
fi
+ label=$(blkid $(ddn $imageDiskDevice 1) -s LABEL -o value)
+ if [ "$label" = "BOOT" ];then
+ export haveBootPartition=1
+ export imageBootDevice=$(ddn $imageDiskDevice 1)
+ fi
+ #======================================
+ # Export bootid if not yet done
+ #--------------------------------------
+ if [ -z "$bootid" ];then
+ export bootid=1
+ fi
+ #======================================
+ # Probe boot partition filesystem
+ #--------------------------------------
+ probeFileSystem $(ddn $imageDiskDevice $bootid)
+ fs_type=$FSTYPE ; FSTYPE=$FSTYPE_SAVE
+ #======================================
+ # Sanity checks
+ #--------------------------------------
+ if [ "$fs_type" = "luks" ]; then
+ # /.../
+ # ups, boot partition should not be luks encoded
+ # unset bootid and hopefully handly it correctly
+ # outside of this function
+ # ----
+ unset bootid
+ fi
if [ -z "$bootid" ] && [[ $kiwi_iname =~ netboot ]];then
# pxe boot env and no suitable boot partition found
export NETBOOT_ONLY=yes
return
fi
- if [ -z "$imageDiskDevice" ];then
- # no disk device like for live ISO based on clicfs
- return
- fi
- if [ -z "$imageBootDevice" ] && [ ! -z "$bootid" ];then
- export imageBootDevice=$(ddn $imageDiskDevice $bootid)
- fi
- if [ ! -e $imageBootDevice ];then
- # no such boot device like for live ISO hybrid disk
+ #======================================
+ # Return if no boot setup required
+ #--------------------------------------
+ if [ $haveBootPartition -eq 0 ] || [ ! -e "$imageBootDevice" ];then
return
fi
#======================================
@@ -8072,18 +7979,10 @@
# symbolic link to make the suse kernel update process
# to work correctly
# ----
- local bootdir
+ local bootdir=boot_bind
#======================================
# find bind boot dir
#--------------------------------------
- for i in \
- yaboot lvmboot btrboot clicboot xfsboot luksboot syslboot
splitboot
- do
- if [ -d /$i ];then
- bootdir=$i
- break
- fi
- done
if [ -z "$bootdir" ];then
return
fi
@@ -8099,7 +7998,7 @@
#======================================
# update fstab entry
#--------------------------------------
- cat /etc/fstab | grep -v bind > /etc/fstab.new
+ cat /etc/fstab | grep -v ^boot_bind > /etc/fstab.new
mv /etc/fstab.new /etc/fstab
cat /etc/fstab | sed -e s@/$bootdir@/boot@ > /etc/fstab.new
mv /etc/fstab.new /etc/fstab
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -584,21 +584,7 @@
#--------------------------------------
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- elif [ ! -z "$COMBINED_IMAGE" ]; then
- updateSplitBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if partitionSize $imageSwapDevice &>/dev/null;then
updateSwapDeviceFstab /config $imageSwapDevice
else
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -227,25 +227,12 @@
if [ "$LOCAL_BOOT" = "no" ];then
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if [ ! -z "$UNIONFS_CONFIG" ]; then
export KIWI_INITRD_PARAMS="UNIONFS_CONFIG=yes"
fi
if [ ! -z "$COMBINED_IMAGE" ]; then
export KIWI_INITRD_PARAMS="COMBINED_IMAGE=local"
- updateSplitBootDeviceFstab /config $imageBootDevice
fi
setupBootLoader /mnt /config $(($bootid - 1)) $imageRootDevice VMX
setupKernelModules /config
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -584,21 +584,7 @@
#--------------------------------------
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- elif [ ! -z "$COMBINED_IMAGE" ]; then
- updateSplitBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if partitionSize $imageSwapDevice &>/dev/null;then
updateSwapDeviceFstab /config $imageSwapDevice
else
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -584,21 +584,7 @@
#--------------------------------------
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- elif [ ! -z "$COMBINED_IMAGE" ]; then
- updateSplitBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if partitionSize $imageSwapDevice &>/dev/null;then
updateSwapDeviceFstab /config $imageSwapDevice
else
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -227,25 +227,12 @@
if [ "$LOCAL_BOOT" = "no" ];then
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if [ ! -z "$UNIONFS_CONFIG" ]; then
export KIWI_INITRD_PARAMS="UNIONFS_CONFIG=yes"
fi
if [ ! -z "$COMBINED_IMAGE" ]; then
export KIWI_INITRD_PARAMS="COMBINED_IMAGE=local"
- updateSplitBootDeviceFstab /config $imageBootDevice
fi
setupBootLoader /mnt /config $(($bootid - 1)) $imageRootDevice VMX
setupKernelModules /config
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -227,25 +227,12 @@
if [ "$LOCAL_BOOT" = "no" ];then
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if [ ! -z "$UNIONFS_CONFIG" ]; then
export KIWI_INITRD_PARAMS="UNIONFS_CONFIG=yes"
fi
if [ ! -z "$COMBINED_IMAGE" ]; then
export KIWI_INITRD_PARAMS="COMBINED_IMAGE=local"
- updateSplitBootDeviceFstab /config $imageBootDevice
fi
setupBootLoader /mnt /config $(($bootid - 1)) $imageRootDevice VMX
setupKernelModules /config
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -584,23 +584,7 @@
#--------------------------------------
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "yaboot" ];then
- updateYaBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- elif [ ! -z "$COMBINED_IMAGE" ]; then
- updateSplitBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if partitionSize $imageSwapDevice &>/dev/null;then
updateSwapDeviceFstab /config $imageSwapDevice
else
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -228,27 +228,12 @@
if [ "$LOCAL_BOOT" = "no" ];then
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "yaboot" ];then
- updateYaBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if [ ! -z "$UNIONFS_CONFIG" ]; then
export KIWI_INITRD_PARAMS="UNIONFS_CONFIG=yes"
fi
if [ ! -z "$COMBINED_IMAGE" ]; then
export KIWI_INITRD_PARAMS="COMBINED_IMAGE=local"
- updateSplitBootDeviceFstab /config $imageBootDevice
fi
setupBootLoader /mnt /config $(($bootid - 1)) $imageRootDevice VMX
setupKernelModules /config
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -588,21 +588,7 @@
#--------------------------------------
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- elif [ ! -z "$COMBINED_IMAGE" ]; then
- updateSplitBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if partitionSize $imageSwapDevice &>/dev/null;then
updateSwapDeviceFstab /config $imageSwapDevice
else
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-16
16:06:13.000000000 +0100
+++ new/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2012-02-17
15:47:20.000000000 +0100
@@ -231,25 +231,12 @@
if [ "$LOCAL_BOOT" = "no" ];then
setupDefaultFstab /config
updateRootDeviceFstab /config $imageRootDevice
- if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $imageBootDevice
- elif [ "$haveClicFS" = "yes" ];then
- updateClicBootDeviceFstab /config $imageBootDevice
- elif [ "$haveBtrFS" = "yes" ];then
- updateBtrBootDeviceFstab /config $imageBootDevice
- elif [ "$haveXFS" = "yes" ];then
- updateXfsBootDeviceFstab /config $imageBootDevice
- elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
- updateSyslinuxBootDeviceFstab /config $imageBootDevice
- elif [ "$haveLuks" = "yes" ];then
- updateLuksBootDeviceFstab /config $imageBootDevice
- fi
+ updateBootDeviceFstab /config $imageBootDevice
if [ ! -z "$UNIONFS_CONFIG" ]; then
export KIWI_INITRD_PARAMS="UNIONFS_CONFIG=yes"
fi
if [ ! -z "$COMBINED_IMAGE" ]; then
export KIWI_INITRD_PARAMS="COMBINED_IMAGE=local"
- updateSplitBootDeviceFstab /config $imageBootDevice
fi
setupBootLoader /mnt /config $(($bootid - 1)) $imageRootDevice VMX
setupKernelModules /config
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
