summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-08-05 06:59:56 +0200
committerSuren A. Chilingaryan <csa@suren.me>2018-08-05 06:59:56 +0200
commit4ce390b9379314455c2b765b67fc39b27d69e6e8 (patch)
tree6af586bd071805d9ed08e3aca8ac19261196fe99
parent12b2ed009050747316afdfb17665a2fafb2836ca (diff)
parentacb918cf6c5401d805273c5661ec336d14b9c009 (diff)
downloadkickstart-4ce390b9379314455c2b765b67fc39b27d69e6e8.tar.gz
kickstart-4ce390b9379314455c2b765b67fc39b27d69e6e8.tar.bz2
kickstart-4ce390b9379314455c2b765b67fc39b27d69e6e8.tar.xz
kickstart-4ce390b9379314455c2b765b67fc39b27d69e6e8.zip
Merge branch 'master' of https://darksoft.org/git/csa/devops/kickstart
-rwxr-xr-xbootcd/build.sh7
-rw-r--r--bootcd/isolinux-centos.cfg6
-rw-r--r--bootcd/isolinux-fedora.cfg4
-rwxr-xr-xbootcd/testvm.sh10
4 files changed, 20 insertions, 7 deletions
diff --git a/bootcd/build.sh b/bootcd/build.sh
index 153ecf0..9c8cdda 100755
--- a/bootcd/build.sh
+++ b/bootcd/build.sh
@@ -1,5 +1,8 @@
#!/bin/bash
+images="root@192.168.26.134:/virtual/images/"
+kickstart="http://ufo.kit.edu/ands/kickstart"
+
#inst.stage2 in isolinux.cfg needs to match the label of ISO, to get lable use 'file <name.iso>' or 'isoinfo -d -i <name.iso>'
#Lantronix Spider does not provide CDROM labels (we can add inst.stage2=cdrom, but this may break booting on multicd systems)
centos74_label="CentOS 7 x86_64"
@@ -52,7 +55,7 @@ echo "Using configuration: $isolinux"
#Generating config
chmod +w $distrib/isolinux
chmod +w $distrib/isolinux/isolinux.cfg
-sed -e "s/@EXTRA@/$extra/g" $isolinux > $distrib/isolinux/isolinux.cfg || die "Can't overwrite the configuration"
+sed -e "s/@EXTRA@/$extra/g" -e "s|@KICKSTART@|$kickstart|g" $isolinux > $distrib/isolinux/isolinux.cfg || die "Can't overwrite the configuration"
#Creating output folder
mkdir -p iso
@@ -75,4 +78,4 @@ mkdir -p iso
)
#Installing
-scp iso/${isoname}.iso root@192.168.26.134:/virtual/images/
+scp iso/${isoname}.iso $images
diff --git a/bootcd/isolinux-centos.cfg b/bootcd/isolinux-centos.cfg
index 54f3a26..58a940e 100644
--- a/bootcd/isolinux-centos.cfg
+++ b/bootcd/isolinux-centos.cfg
@@ -11,13 +11,13 @@ timeout 10
label auto
menu label ^Kickstart CentOS 7 for Ands
kernel vmlinuz
- append initrd=initrd.img inst.stage2=hd:LABEL=CentOS\x207\x20x86_64 @EXTRA@ console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.vnc inst.vncpassword=ipepdv inst.ks=http://ufo.kit.edu/ands/kickstart/centos/ inst.ks.sendsn inst.ks.sendmac
-# append initrd=initrd.img inst.stage2=hd:LABEL=CentOS\x207\x20x86_64 @EXTRA@ nomodeset text console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.vnc inst.vncpassword=ipepdv inst.ks=http://ufo.kit.edu/ands/kickstart/ inst.ks.sendsn inst.ks.sendmac
+ append initrd=initrd.img inst.stage2=hd:LABEL=CentOS\x207\x20x86_64 @EXTRA@ console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.vnc inst.vncpassword=ipepdv inst.ks=@KICKSTART@/centos/ inst.ks.sendsn inst.ks.sendmac
+# append initrd=initrd.img inst.stage2=hd:LABEL=CentOS\x207\x20x86_64 @EXTRA@ nomodeset text console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.vnc inst.vncpassword=ipepdv inst.ks=@KICKSTART@/ inst.ks.sendsn inst.ks.sendmac
label local
menu label ^Kickstart CentOS 7 for Ands
kernel vmlinuz
- append initrd=initrd.img inst.stage2=hd:LABEL=CentOS\x207\x20x86_64 @EXTRA@ console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.ks=http://ufo.kit.edu/ands/kickstart/centos/ inst.ks.sendsn inst.ks.sendmac xdriver=vesa nomodeset
+ append initrd=initrd.img inst.stage2=hd:LABEL=CentOS\x207\x20x86_64 @EXTRA@ console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.ks=@KICKSTART@/centos/ inst.ks.sendsn inst.ks.sendmac xdriver=vesa nomodeset
label linux
menu label ^Install CentOS 7
diff --git a/bootcd/isolinux-fedora.cfg b/bootcd/isolinux-fedora.cfg
index 2580b41..962feda 100644
--- a/bootcd/isolinux-fedora.cfg
+++ b/bootcd/isolinux-fedora.cfg
@@ -10,12 +10,12 @@ timeout 100
label auto
menu label ^Kickstart Fedora 28
kernel vmlinuz
- append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-S-dvd-x86_64-28 @EXTRA@ console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.vnc inst.vncpassword=ipepdv inst.ks=http://ufo.kit.edu/ands/kickstart/fedora/ inst.ks.sendsn inst.ks.sendmac
+ append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-S-dvd-x86_64-28 @EXTRA@ console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.vnc inst.vncpassword=ipepdv inst.ks=@KICKSTART@/fedora/ inst.ks.sendsn inst.ks.sendmac
label local
menu label ^Kickstart Locally Fedora 28
kernel vmlinuz
- append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-S-dvd-x86_64-28 @EXTRA@ console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.ks=http://ufo.kit.edu/ands/kickstart/fedora/ inst.ks.sendsn inst.ks.sendmac
+ append initrd=initrd.img inst.stage2=hd:LABEL=Fedora-S-dvd-x86_64-28 @EXTRA@ console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200 ip=dhcp inst.ks=@KICKSTART@/fedora/ inst.ks.sendsn inst.ks.sendmac
label linux
menu label ^Install Fedora 28
diff --git a/bootcd/testvm.sh b/bootcd/testvm.sh
new file mode 100755
index 0000000..ee29f5d
--- /dev/null
+++ b/bootcd/testvm.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+sudo modprobe kvm-intel
+sudo /etc/init.d/vde start
+
+mkdir -p vm
+[ ! -f vm/1.qcow2 ] && qemu-img create -f qcow2 vm/1.qcow2 "80G"
+[ ! -f vm/2.qcow2 ] && qemu-img create -f qcow2 vm/2.qcow2 "80G"
+
+qemu-system-x86_64 -enable-kvm -display sdl -hda vm/1.qcow2 -hdb vm/2.qcow2 -m 2048 -net nic,macaddr=66:66:66:13:13:00 -net vde,sock=/var/run/vde.ctl -cdrom iso/centos74-ands.iso -boot order=d