diff --git a/create_pxeinitrd.sh b/create_pxeinitrd.sh index 5f2b05e..c2a55dc 100755 --- a/create_pxeinitrd.sh +++ b/create_pxeinitrd.sh @@ -62,7 +62,7 @@ echo "ipv4: \4 ipv6: \6" >>$MNT_DIR/etc/issue rm -f $MNT_DIR/etc/apt/sources.list echo 'deb https://mirrors.wit.com/debian sid main contrib non-free' > $MNT_DIR/etc/apt/sources.list -echo 'deb https://mirrors.wit.com/debcore sid main' >> $MNT_DIR/etc/apt/sources.list +echo 'deb https://mirrors.wit.com/debcore sid main experimental' >> $MNT_DIR/etc/apt/sources.list curl https://mirrors.wit.com/debcore/public.key | LANG=C DEBIAN_FRONTEND=noninteractive chroot $MNT_DIR apt-key add - LANG=C DEBIAN_FRONTEND=noninteractive chroot $MNT_DIR apt-get update diff --git a/files/grub-addon-amd64.cfg b/files/grub-addon-amd64.cfg index 36a1132..fc7d1c6 100644 --- a/files/grub-addon-amd64.cfg +++ b/files/grub-addon-amd64.cfg @@ -8,7 +8,7 @@ menuentry "install-amd64" { initrd /wit-pxeboot/initramfs-amd64.gz } -#label installbastion -# kernel wit-pxeboot/vmlinuz -# append initrd=wit-pxeboot/initramfs.gz acpi=off console=tty0 console=ttyS1,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export ANSIBLEPULL="--extra-vars=bastion_bootstrap=true --accept-host-key --key-file=/tmp/id_rsa --url=git@git.wit.com:netops/ansible.git bastion-usw3-temp.yaml"; export INSTALLEXTRA="git ansible"; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1' --- -# +label installbastion + kernel wit-pxeboot/vmlinuz + append initrd=wit-pxeboot/initramfs.gz acpi=off console=tty0 console=ttyS1,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export REGION=xxx; export DEBIAN_FRONTEND=noninteractive; export ANSIBLEPULL="--extra-vars=bastion_bootstrap=true --accept-host-key --key-file=/tmp/id_rsa --url=git@git.wit.com:netops/ansible.git bastion.yaml"; export INSTALLEXTRA="git ansible"; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1' --- +