From 697c30944e6b639d68b723422433c5406d4c8540 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Dec 09 2015 11:59:23 +0000
Subject: Merge branch 'master' of https://git.centos.org/git/sig-core/livemedia


---

diff --git a/kickstarts/centos-7-live-gnome-i386.cfg b/kickstarts/centos-7-live-gnome-i386.cfg
index 513d2db..f86ab1d 100644
--- a/kickstarts/centos-7-live-gnome-i386.cfg
+++ b/kickstarts/centos-7-live-gnome-i386.cfg
@@ -1,7 +1,7 @@
 
-lang en_GB.UTF-8
+lang en_US.UTF-8
 keyboard us
-timezone Europe/Brussels --isUtc
+timezone Etc/UTC --isUtc
 auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
@@ -15,8 +15,8 @@ rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXya
 
 # Workaround for the grubby issue on live media (see https://bugzilla.redhat.com/show_bug.cgi?id=1153410)
 repo --name=base --baseurl=http://mirror.centos.org/altarch/7/os/i386/ --excludepkgs=grubby
-repo --name=grubby --baseurl=http://dev.centos.org/c7.00.02/
-repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/
+repo --name=grubby --baseurl=http://dev.centos.org/c7.00.02/ --includepkgs=grubby --excludepkgs=*.x86_64
+repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/ --excludepkgs=grubby
  
 %packages
 @base
diff --git a/kickstarts/centos-7-live-kde-i386.cfg b/kickstarts/centos-7-live-kde-i386.cfg
index f66ea95..f076ed3 100644
--- a/kickstarts/centos-7-live-kde-i386.cfg
+++ b/kickstarts/centos-7-live-kde-i386.cfg
@@ -1,7 +1,7 @@
 
-lang en_GB.UTF-8
+lang en_US.UTF-8
 keyboard us
-timezone Europe/Brussels --isUtc
+timezone Etc/UTC --isUtc
 auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
@@ -15,8 +15,8 @@ rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXya
 
 # Workaround for the grubby issue on live media (see https://bugzilla.redhat.com/show_bug.cgi?id=1153410)
 repo --name=base --baseurl=http://mirror.centos.org/altarch/7/os/i386/ --excludepkgs=grubby
-repo --name=grubby --baseurl=http://dev.centos.org/c7.00.02/
-repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/
+repo --name=grubby --baseurl=http://dev.centos.org/c7.00.02/ --includepkgs=grubby --excludepkgs=*.x86_64
+repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/ --excludepkgs=grubby
 
 %packages
 @base
diff --git a/kickstarts/centos-7-livecd-i386.cfg b/kickstarts/centos-7-livecd-i386.cfg
index cacc843..d978e5e 100644
--- a/kickstarts/centos-7-livecd-i386.cfg
+++ b/kickstarts/centos-7-livecd-i386.cfg
@@ -1,7 +1,7 @@
 
-lang en_GB.UTF-8
+lang en_US.UTF-8
 keyboard us
-timezone Europe/Brussels --isUtc
+timezone Etc/UTC --isUtc
 auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
@@ -15,8 +15,8 @@ rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXya
 
 # Workaround for the grubby issue on live media (see https://bugzilla.redhat.com/show_bug.cgi?id=1153410)
 repo --name=base --baseurl=http://mirror.centos.org/altarch/7/os/i386/ --excludepkgs=grubby
-repo --name=grubby --baseurl=http://dev.centos.org/c7.00.02/
-repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/
+repo --name=grubby --baseurl=http://dev.centos.org/c7.00.02/ --includepkgs=grubby --excludepkgs=*.x86_64
+repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/ --excludepkgs=grubby
 
 %packages
 abattis-cantarell-fonts