From bcd0868aa492696405a9a16c371e981549b37754 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Jul 14 2011 06:34:48 +0000
Subject: changed -r opt to mandatory in the build-wrapper script


---

diff --git a/build_c6_live.sh b/build_c6_live.sh
index 8face69..aecd10b 100755
--- a/build_c6_live.sh
+++ b/build_c6_live.sh
@@ -36,7 +36,7 @@ fi
 }
 
 
-while getopts “ha:p:m:r” OPTION
+while getopts “ha:p:m:r:” OPTION
 do
      case $OPTION in
          h)
@@ -65,6 +65,7 @@ done
 varcheck $arch
 varcheck $media
 varcheck $repopath
+varcheck $release
 
 if [ `id -u` -ne "0" ]; then
 	echo "you must call this script as root or with proper sudo permissions !"
@@ -89,7 +90,7 @@ if [ "$isSelinuxOn" = "Enforcing" ] ;then
 	/usr/sbin/setenforce 0
 fi
 
-/bin/cp ks/centos6-live${media}-desktop.cfg /tmp/
+/bin/cp $(dirname $0)/ks/centos6-live${media}-desktop.cfg /tmp/
 sed -i s#REPOPATH#$repopath#g /tmp/centos6-live${media}-desktop.cfg
 setarch $arch livecd-creator -c /tmp/centos6-live${media}-desktop.cfg -f "CentOS-${release}-${arch}-Live${media}" 
 
diff --git a/ks/centos6-liveCD-desktop.cfg b/ks/centos6-liveCD-desktop.cfg
index 507c708..9cf5d2c 100644
--- a/ks/centos6-liveCD-desktop.cfg
+++ b/ks/centos6-liveCD-desktop.cfg
@@ -34,7 +34,6 @@ genisoimage
 wodim
 libXmu
 -abrt-cli
--Red_Hat_Enterprise_Linux-Release_Notes-6-en-US
 -abrt-addon-kerneloops
 -abrt-addon-ccpp
 -nano
@@ -399,6 +398,7 @@ if ! strstr "\\\`cat /proc/cmdline\\\`" nolvmmount ; then
 	fi
 fi
 
+
 # give back ownership to the default user
 chown -R $LIVECD_USER:$LIVECD_USER /home/$LIVECD_USER
 EOF_initscript
@@ -453,6 +453,9 @@ if [ -n "\$xdriver" ]; then
     exists system-config-display --noui --reconfig --set-depth=24 \\\$xdriver
 fi
 
+# Fix the "liveinst doesn't start in gui mode when not enough memory available" - switching to terminal mode
+sed -i "s/Terminal=false/Terminal=true/" /home/$LIVECD_USER/Desktop/liveinst.desktop
+
 EOF_lateinitscript
 
 # workaround avahi segfault (#279301)
@@ -481,9 +484,6 @@ rm -f /core*
 rm -f /.readahead_collect
 touch /var/lib/readahead/early.sorted
 
-# import RPM GPG keys
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
 
 EOF_post
 
@@ -547,8 +547,6 @@ sed -i "s/rhgb/rhgb vga=791/g"	\$LIVE_ROOT/isolinux/isolinux.cfg
 # Disabling auto lvm/disk mount (that will crash the "Install to Hard Drive feature")
 sed -i "s/quiet/quiet nodiskmount nolvmmount/g"	\$LIVE_ROOT/isolinux/isolinux.cfg
 
-# Fix the "liveinst doesn't start in gui mode when not enough memory available" - switching to terminal mode
-sed -i "s/Terminal=false/Terminal=true/" \$LIVE_ROOT/home/centoslive/Desktop/liveinst.desktop
 
 EOF_postnochroot
 
diff --git a/ks/centos6-liveDVD-desktop.cfg b/ks/centos6-liveDVD-desktop.cfg
index 2c44197..8d44e87 100644
--- a/ks/centos6-liveDVD-desktop.cfg
+++ b/ks/centos6-liveDVD-desktop.cfg
@@ -502,10 +502,6 @@ rm -f /core*
 rm -f /.readahead_collect
 touch /var/lib/readahead/early.sorted
 
-# import RPM GPG keys
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-
 EOF_post
 
 /bin/bash -x /root/post-install 2>&1 | tee /root/post-install.log