[Pkg-libvirt-commits] [libguestfs] 41/156: builder: Update rhel.sh script for RHEL 7 GA.

[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 5a6d1f9be3b5428a9aa707ddce9b514c9faa4b88
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Jun 11 08:21:34 2014 +0100

    builder: Update rhel.sh script for RHEL 7 GA.
    
    Set the rootfs for RHEL 7.x to xfs.  (/boot is ext4)
    
    Remove old RHEL 7 beta & rc releases.
    
    (cherry picked from commit 24800d2e96b668252e30977f3af81aa3b2195eef)
---
 builder/website/rhel.sh | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/builder/website/rhel.sh b/builder/website/rhel.sh
index 7a1241b..feba983 100755
--- a/builder/website/rhel.sh
+++ b/builder/website/rhel.sh
@@ -42,6 +42,7 @@ case $version in
         tree=$topurl/x86_64/os/Server
         srpms=$topurl/source/SRPMS
         bootfs=ext2
+        rootfs=ext4
         guestroot=/dev/sda2
         ;;
     6.*)
@@ -52,24 +53,17 @@ case $version in
         optional=$topurl/Server/optional/x86_64/os
         optionalsrpms=$topurl/Server/optional/source/SRPMS
         bootfs=ext4
+        rootfs=ext4
         ;;
-    7beta1)
+    7.*)
         major=7
-        topurl=http://download.devel.redhat.com/released/RHEL-7/7.0-Beta-1
+        topurl=http://download.devel.redhat.com/released/RHEL-$major/$version
         tree=$topurl/Server/x86_64/os
         srpms=$topurl/source/SRPMS
         optional=$topurl/Server/optional/x86_64/os
         optionalsrpms=$topurl/Server/optional/source/SRPMS
         bootfs=ext4
-        ;;
-    7rc)
-        major=7
-        topurl=ftp://ftp.redhat.com/redhat/rhel/rc/7
-        tree=$topurl/Server/x86_64/os
-        srpms=$topurl/Server/source/SRPMS
-        optional=$topurl/Server-optional/x86_64/os
-        optionalsrpms=$topurl/Server-optional/source/SRPMS
-        bootfs=ext4
+        rootfs=xfs
         ;;
     *)
         echo "$0: version $version not supported by this script yet"
@@ -104,7 +98,7 @@ zerombr
 clearpart --all --initlabel
 part /boot --fstype=$bootfs --size=512         --asprimary
 part swap                   --size=1024        --asprimary
-part /     --fstype=ext4    --size=1024 --grow --asprimary
+part /     --fstype=$rootfs --size=1024 --grow --asprimary
 
 # Halt the system once configuration has finished.
 poweroff

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