SoaS: merge fixes from branch

This commit is contained in:
Peter Robinson
2011-06-12 18:41:33 +01:00
parent c3a1adefdc
commit ff0315f017
2 changed files with 7 additions and 3 deletions

View File

@@ -10,7 +10,7 @@ selinux --permissive
firewall --enabled --service=mdns
xconfig --startxonboot
part / --size 4096 --fstype ext4
services --enabled=NetworkManager,messagebus --disabled=network,sshd,iscsi,iscsid,lldpad
services --enabled=NetworkManager,messagebus,avahi-daemon --disabled=network,sshd,iscsi,iscsid,lldpad
repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
@@ -392,8 +392,7 @@ rm -f /core*
%end
%post
%post --nochroot
cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
# only works on x86, x86_64