Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts

2009-03-06 15:07:31 +01:00 · 2009-03-06 15:07:31 +01:00 · cafd01a101
commit cafd01a101
parent 441cc3f424 80ff46c81d
2 changed files with 4 additions and 0 deletions
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@ -11,6 +11,8 @@
@sound-and-video
@gnome-desktop
 nss-mdns
+NetworkManager-vpnc
+NetworkManager-openvpn
 # we don't include @office so that we don't get OOo.  but some nice bits
 abiword
 #gnumeric
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@ -16,6 +16,8 @@
 -imsettings-xfce

 firefox
+NetworkManager-vpnc
+NetworkManager-openvpn
 NetworkManager-gnome
 NetworkManager-pptp