Fix VM installation script

KIT-OSGroup · May 13, 2022 · fa50252 · fa50252
1 parent 5e51e14
commit fa50252
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/artifact-evaluation/vm/create-vinter-vm.sh b/artifact-evaluation/vm/create-vinter-vm.sh
@@ -41,16 +41,7 @@ echo " => root password: $password"
 echo "root:$password" | sudo chroot "$mountpath" /usr/sbin/chpasswd || fail "could not set root password"
 echo " => copying repositories"
 sudo mkdir "$mountpath/home/vinter"
-sudo git clone "$vinterdir" --single-branch "$mountpath/home/vinter/vinter"
-sudo git clone "$vinterdir/panda" --single-branch "$mountpath/home/vinter/vinter/panda"
-sudo git clone "$vinterdir/fs-testing/linux/nova" --bare --single-branch -b vinter-nova "$mountpath/home/vinter/linux.git"
-sudo git -C "$mountpath/home/vinter/linux.git" fetch "$vinterdir/fs-testing/linux/pmfs" vinter-pmfs:vinter-pmfs
-sudo git -C "$mountpath/home/vinter/linux.git" worktree add "$mountpath/home/vinter/fs-testing/linux/nova" vinter-nova
-sudo git -C "$mountpath/home/vinter/linux.git" worktree add "$mountpath/home/vinter/fs-testing/linux/pmfs" vinter-pmfs
-# set public upstream URLs
-sudo git -C "$mountpath/home/vinter/vinter" remote set-url origin https://github.com/KIT-OSGroup/vinter
-sudo git -C "$mountpath/home/vinter/vinter/panda" remote set-url origin https://github.com/KIT-OSGroup/panda
-sudo git -C "$mountpath/home/vinter/linux.git" remote set-url origin https://github.com/KIT-OSGroup/linux
+sudo cp "$scriptdir/install-vinter.sh" "$mountpath/home/vinter"
 
 cleanup
 

diff --git a/artifact-evaluation/vm/install-vinter.sh b/artifact-evaluation/vm/install-vinter.sh
@@ -18,6 +18,9 @@ setup_root() {
 	dnf install -y '@C Development Tools and Libraries' podman git zip zstd bc time jq qemu-img python3-pip python3-mypy python3-capstone glibc-static elfutils-libelf-devel dtc capstone-devel libdwarf-devel glib2-devel pixman-devel protobuf-devel protobuf-c-devel curl-devel jsoncpp-devel chrpath datamash telnet
 	pip install yq sortedcontainers
 
+	# Disable SELinux so that podman works.
+	setenforce 0
+
 	sudo -iu vinter "$script"
 }
 
@@ -27,6 +30,11 @@ setup_vinter() {
 	. "$HOME/.cargo/env"
 	rustup target add x86_64-unknown-linux-musl
 
+	git clone --recursive https://github.com/KIT-OSGroup/vinter
+	git clone https://github.com/KIT-OSGroup/linux --bare linux.git
+	git -C "linux.git" worktree add "../vinter/fs-testing/linux/nova" vinter-nova
+	git -C "linux.git" worktree add "../vinter/fs-testing/linux/pmfs" vinter-pmfs
+
 	cd vinter
 	./build-panda.sh
 	./build-vinter.sh