From 2e9a8018da39c132c398c3775ada4300d9706e38 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Fri, 26 Oct 2018 06:43:09 +0000 Subject: [PATCH] Change Ubuntu images symbolic links from distro name to version --- README.md | 7 +++++++ tools/kernel-factory/Ubuntu/14.04/Image | 2 +- tools/kernel-factory/Ubuntu/16.04/Image | 2 +- tools/kernel-factory/Ubuntu/18.04/Image | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4ee7a30..5293a01 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,12 @@ out-of-tree kernel {module, exploit} development tool Read [Qemu API](qemu/README.md). +### Generate images + + $ cd $GOPATH/src/github.com/jollheef/out-of-tree/tools/qemu-debian-img/ + $ docker run --privileged -v $(pwd):/shared -e IMAGE=/shared/ubuntu1404.img -e RELEASE=trusty -t gen-ubuntu1804-image + $ docker run --privileged -v $(pwd):/shared -e IMAGE=/shared/ubuntu1604.img -e RELEASE=xenial -t gen-ubuntu1804-image + ### Generate kernels cd $GOPATH/src/github.com/jollheef/out-of-tree/tools/kernel-factory @@ -20,6 +26,7 @@ If you already have Go, Qemu, Vagrant and Docker installed, there's cross-platfo $ go get github.com/jollheef/out-of-tree $ cd $GOPATH/src/github.com/jollheef/out-of-tree/tools/qemu-debian-img/ $ ./bootstrap.sh + $ docker run --privileged -v $(pwd):/shared -e IMAGE=/shared/ubuntu1604.img -e RELEASE=xenial -t gen-ubuntu1804-image $ cd ../kernel-factory $ rm -rf {Debian,CentOS,Ubuntu/{14.04,18.04}} # speed up :) $ ./bootstrap.sh diff --git a/tools/kernel-factory/Ubuntu/14.04/Image b/tools/kernel-factory/Ubuntu/14.04/Image index 506b573..e9296dc 120000 --- a/tools/kernel-factory/Ubuntu/14.04/Image +++ b/tools/kernel-factory/Ubuntu/14.04/Image @@ -1 +1 @@ -../../../qemu-debian-img/trusty.img \ No newline at end of file +../../../qemu-debian-img/ubuntu1404.img \ No newline at end of file diff --git a/tools/kernel-factory/Ubuntu/16.04/Image b/tools/kernel-factory/Ubuntu/16.04/Image index 6ec48d1..bd76306 120000 --- a/tools/kernel-factory/Ubuntu/16.04/Image +++ b/tools/kernel-factory/Ubuntu/16.04/Image @@ -1 +1 @@ -../../../qemu-debian-img/xenial.img \ No newline at end of file +../../../qemu-debian-img/ubuntu1604.img \ No newline at end of file diff --git a/tools/kernel-factory/Ubuntu/18.04/Image b/tools/kernel-factory/Ubuntu/18.04/Image index 3206e56..9b13ebe 120000 --- a/tools/kernel-factory/Ubuntu/18.04/Image +++ b/tools/kernel-factory/Ubuntu/18.04/Image @@ -1 +1 @@ -../../../qemu-debian-img/bionic.img \ No newline at end of file +../../../qemu-debian-img/ubuntu1804.img \ No newline at end of file