contrib/nm-live-vm: update scripts to make VM based on Fedora 20

Signed-off-by: Jiří Klimeš <jklimes@redhat.com>

2 files changed, 10 insertions, 10 deletions

diff --git a/contrib/fedora/nm-live-vm/README b/contrib/fedora/nm-live-vm/README
index c0da9e35be..75cff68a07 100644
--- a/contrib/fedora/nm-live-vm/README
+++ b/contrib/fedora/nm-live-vm/README
@@ -1,20 +1,20 @@
 NetworkManager live VM scripts
 ------------------------------
 
-This set of scripts can be used to build a live initramfs image suitable
-for testing NetworkManager in a virtual environment. The scripts themselves
-are intended to be used by a power user who can adapt them to their needs.
-The result, on the contrary, is intended to be used by anyone who wants to
-play with NetworkManager on the command line.
+This set of scripts can be used to build a live initramfs image suitable for
+testing NetworkManager in a virtual environment. The scripts themselves are
+intended to be used by a power user who can adapt them to their needs. The
+result, on the contrary, is intended to be used by anyone who wants to play
+with NetworkManager on the command line.
 
 Building the initramfs image:
 
 sudo ./build.sh [-n name] [-b branch/commit]
 
 You may have to update ./build.sh to suit your distribution. The included
-is prepared for Fedora 18 and the image is also build using Fedora 18
+version is prepared for Fedora 20 and the image is also build using Fedora 20
 repositories.
 
-Then you can distribute the self-extracting archive and run in on other machines:
+Then you can distribute the self-extracting archive and run it on other machines:
 
 ./nm-live-vm-bundle.sh
diff --git a/contrib/fedora/nm-live-vm/build.sh b/contrib/fedora/nm-live-vm/build.sh
index b308076b03..1a36ba8992 100755
--- a/contrib/fedora/nm-live-vm/build.sh
+++ b/contrib/fedora/nm-live-vm/build.sh
@@ -30,7 +30,7 @@ fi
 
 BUILD_PACKAGES="qemu febootstrap mock rpmdevtools"
 ARCH=i386
-ROOT="${ROOT:-"fedora-18-$ARCH"}"
+ROOT="${ROOT:-"fedora-20-$ARCH"}"
 TREE="/var/lib/mock/$ROOT/root"
 PACKAGES="kernel passwd git autoconf automake libtool intltool gtk-doc libnl3-devel
     dbus-glib-devel libgudev1-devel libuuid-devel nss-devel ppp-devel dhclient
@@ -39,9 +39,9 @@ PACKAGES="kernel passwd git autoconf automake libtool intltool gtk-doc libnl3-de
     gdb valgrind lsof strace nmap-ncat tcpdump
     net-tools bridge-utils vconfig
     teamd libteam"
-KERNEL_URL=http://kojipkgs.fedoraproject.org/packages/kernel/3.8.5/201.fc18/i686/kernel-3.8.5-201.fc18.i686.rpm
+KERNEL_URL=http://kojipkgs.fedoraproject.org/packages/kernel/3.12.9/301.fc20/i686/kernel-3.12.9-301.fc20.i686.rpm
 KERNEL=`basename "${KERNEL_URL%.rpm}"`
-#RELEASE="http://kojipkgs.fedoraproject.org/packages/fedora-release/18/1/noarch/fedora-release-18-1.noarch.rpm"
+#RELEASE="http://kojipkgs.fedoraproject.org/packages/fedora-release/20/1/noarch/fedora-release-20-1.noarch.rpm"
 #PACKAGES="systemd bash"
 
 check_root() {