From ff08154f5d16a48feb6af94737f1e92c26f5bb56 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 21 Oct 2021 12:52:22 +0200
Subject: move kickstart script

---
 kickstart/centos8.sh             |  2 +-
 kickstart/fedora.sh              |  2 +-
 kickstart/rhel8.sh               |  2 +-
 kickstart/rhel9.sh               |  2 +-
 kickstart/run-install.sh         | 25 -------------------------
 scripts/run-kickstart-install.sh | 25 +++++++++++++++++++++++++
 6 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100755 kickstart/run-install.sh
 create mode 100755 scripts/run-kickstart-install.sh

diff --git a/kickstart/centos8.sh b/kickstart/centos8.sh
index 7164dfe..604bed1 100755
--- a/kickstart/centos8.sh
+++ b/kickstart/centos8.sh
@@ -7,5 +7,5 @@ repo="http://spunk.home.kraxel.org/centos/8/BaseOS/x86_64/os/"
 dest="/vmdisk/hdd/imagefish"
 
 disk="${dest}/${name}-${vers}-ks-x86_64.qcow2"
-./run-install.sh "$disk" "$repo" el8.ks
+../scripts/run-kickstart-install.sh "$disk" "$repo" el8.ks
 sudo chown kraxel.kraxel "$disk"
diff --git a/kickstart/fedora.sh b/kickstart/fedora.sh
index 5b867fe..5ad49e1 100755
--- a/kickstart/fedora.sh
+++ b/kickstart/fedora.sh
@@ -7,5 +7,5 @@ repo="http://spunk.home.kraxel.org/mirror/fedora/rsync/f${vers}-release/Server/x
 dest="/vmdisk/hdd/imagefish"
 
 disk="${dest}/${name}-${vers}-ks-x86_64.qcow2"
-./run-install.sh "$disk" "$repo" "fedora.ks"
+../scripts/run-kickstart-install.sh "$disk" "$repo" "fedora.ks"
 sudo chown kraxel.kraxel "$disk"
diff --git a/kickstart/rhel8.sh b/kickstart/rhel8.sh
index 66ae32e..5b8dbd9 100755
--- a/kickstart/rhel8.sh
+++ b/kickstart/rhel8.sh
@@ -13,6 +13,6 @@ vers="8.5.0 8.4.0"
 for v in $vers; do
 	disk="${dest}/${name}-${v}-ks-x86_64.qcow2"
 	repo="${base}/latest-RHEL-${v}/compose/BaseOS/x86_64/os/"
-	./run-install.sh "$disk" "$repo" el8.ks
+	../scripts/run-kickstart-install.sh "$disk" "$repo" el8.ks
 	sudo chown kraxel.kraxel "$disk"
 done
diff --git a/kickstart/rhel9.sh b/kickstart/rhel9.sh
index af90af6..5decb00 100755
--- a/kickstart/rhel9.sh
+++ b/kickstart/rhel9.sh
@@ -11,6 +11,6 @@ vers="9.0.0"
 for v in $vers; do
 	disk="${dest}/${name}-${v}-ks-x86_64.qcow2"
 	repo="${base}/latest-RHEL-${v}/compose/BaseOS/x86_64/os/"
-	./run-install.sh "$disk" "$repo" fedora.ks
+	../scripts/run-kickstart-install.sh "$disk" "$repo" fedora.ks
 	sudo chown kraxel.kraxel "$disk"
 done
diff --git a/kickstart/run-install.sh b/kickstart/run-install.sh
deleted file mode 100755
index 2836aa4..0000000
--- a/kickstart/run-install.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# args
-disk="$1"
-repo="$2"
-kick="${3-el8.ks}"
-size="${4-4}"
-
-# go!
-name="$(basename $disk .qcow2)"
-
-rm -f "$disk"
-exec virt-install \
-	--virt-type kvm \
-	--os-variant rhel8.0 \
-	--arch x86_64 \
-	--memory 4096 \
-	--nographics \
-	--transient \
-	--network user \
-	--name "virt-install-${name}" \
-	--disk "bus=scsi,format=qcow2,sparse=yes,size=${size},path=${disk}" \
-	--initrd-inject "${kick}" \
-	--extra-args "console=ttyS0 inst.ks=file:/${kick##*/}" \
-	--location "$repo"
diff --git a/scripts/run-kickstart-install.sh b/scripts/run-kickstart-install.sh
new file mode 100755
index 0000000..2836aa4
--- /dev/null
+++ b/scripts/run-kickstart-install.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# args
+disk="$1"
+repo="$2"
+kick="${3-el8.ks}"
+size="${4-4}"
+
+# go!
+name="$(basename $disk .qcow2)"
+
+rm -f "$disk"
+exec virt-install \
+	--virt-type kvm \
+	--os-variant rhel8.0 \
+	--arch x86_64 \
+	--memory 4096 \
+	--nographics \
+	--transient \
+	--network user \
+	--name "virt-install-${name}" \
+	--disk "bus=scsi,format=qcow2,sparse=yes,size=${size},path=${disk}" \
+	--initrd-inject "${kick}" \
+	--extra-args "console=ttyS0 inst.ks=file:/${kick##*/}" \
+	--location "$repo"
-- 
cgit