[Pkg-libvirt-commits] [libguestfs] 10/156: builder: Fix RHEL script for RHEL 5.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit d20311fffa011fd84eab7142cc90f5b2416b4b1a
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat May 10 17:18:39 2014 +0100

    builder: Fix RHEL script for RHEL 5.
    
    Root partition is on /dev/sda2:
    
    $ virt-filesystems -a rhel-5.10 --all --long -h
    Name       Type        VFS   Label      MBR  Size  Parent
    /dev/sda1  filesystem  ext2  /boot      -    510M  -
    /dev/sda2  filesystem  ext4  /          -    4.5G  -
    /dev/sda3  filesystem  swap  SWAP-hda3  -    1.0G  -
    /dev/sda1  partition   -     -          83   510M  /dev/sda
    /dev/sda2  partition   -     -          83   4.5G  /dev/sda
    /dev/sda3  partition   -     -          82   1.0G  /dev/sda
    /dev/sda   device      -     -          -    6.0G  -
    
    It would be better if we could mount by label in guestfish ...
    
    There is another problem with RHEL 5 guests in that the
    yum URL is slightly wrong.
    
    (cherry picked from commit 3bc9ba6c8447cde07db057aea76d0d72f5d833df)
---
 builder/website/rhel.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builder/website/rhel.sh b/builder/website/rhel.sh
index c51c7ac..7efff0d 100755
--- a/builder/website/rhel.sh
+++ b/builder/website/rhel.sh
@@ -32,6 +32,7 @@ fi
 version=$1
 output=rhel-$version
 tmpname=tmp-$(tr -cd 'a-f0-9' < /dev/urandom | head -c 8)
+guestroot=/dev/sda3
 
 case $version in
     5.*)
@@ -41,6 +42,7 @@ case $version in
         tree=$topurl/x86_64/os
         srpms=$topurl/source/SRPMS
         bootfs=ext2
+        guestroot=/dev/sda2
         ;;
     6.*)
         major=6
@@ -178,7 +180,7 @@ virt-install \
 
 # We have to replace yum config so it doesn't try to use RHN (it
 # won't be registered).
-guestfish --rw -a $output -m /dev/sda3 \
+guestfish --rw -a $output -m $guestroot \
   upload $yum /etc/yum.repos.d/download.devel.redhat.com.repo
 
 source $(dirname "$0")/compress.sh $output

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git