Merge remote-tracking branch 'joanna/master'

This commit is contained in:
Marek Marczykowski 2012-07-18 11:45:48 +02:00
commit 72f6fd4d40
3 changed files with 4 additions and 1 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
*~ *~
base_rpms base_rpms
keys keys
appmenus

View File

@ -41,6 +41,8 @@ mount -t proc proc mnt/proc
echo "--> Installing RPMs..." echo "--> Installing RPMs..."
yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$(pwd)/mnt rpms_to_install/*rpm yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$(pwd)/mnt rpms_to_install/*rpm
echo "--> Installing 3rd party apps"
./add_3rd_party_software.sh
echo "--> Copying the Apps Menu shortcuts..." echo "--> Copying the Apps Menu shortcuts..."
APPSORIG=qubeized_images/$NAME-apps.orig APPSORIG=qubeized_images/$NAME-apps.orig

View File

@ -1 +1 @@
1.4.8 1.4.12