trying to get the deb builer work to build 2 independent packages that don't stop on each others toes upon install. issue on grub.cfg is still preset. other overlapping files are fixed now

This commit is contained in:
toby 2019-01-10 11:47:36 +00:00
parent 84e7c07d69
commit e8bc8fb791
5 changed files with 10 additions and 30 deletions

View File

@ -220,6 +220,8 @@ if [[ $ARCH = amd64 ]]
grub-mknetdir --net-directory=$RESULT_DIR/
fi
rm -rf $RESULT_DIR/boot/grub/locale/ $RESULT_DIR/boot/grub/fonts/
ls -la $RESULT_DIR/

View File

@ -1,3 +1,3 @@
files/kernel/* /srv/tftp/wit-pxeboot/
files/boot/* /srv/tftp/boot/
files/grub.cfg /srv/tftp/boot/grub/
files/grub-addon-amd64.cfg /srv/tftp/boot/grub/

View File

@ -1,3 +1,3 @@
files/kernel/* /srv/tftp/wit-pxeboot/
files/boot/* /srv/tftp/boot/
files/grub.cfg /srv/tftp/boot/grub/
files/grub-addon-arm64.cfg /srv/tftp/boot/grub/

View File

@ -9,6 +9,7 @@ sudo ARCH=$ARCH TMP_DIR=$TMP_DIR ./create_pxeinitrd.sh
cd $TMP_DIR
sudo dpkg-buildpackage --no-sign
ls -lha ../wit-pxeboot-${ARCH}_*_all.deb
echo scp -i ~/.ssh/packager -o StrictHostKeyChecking=no -P 22022 ../wit-pxeboot-${ARCH}_*_all.deb root@cloud-api.v2.stack.wit.com:/data/incoming
#cd -
#sudo rm -fr $TMP_DIR
scp -i ~/.ssh/packager -o StrictHostKeyChecking=no -P 22022 ../wit-pxeboot-${ARCH}_*_all.deb root@cloud-api.v2.stack.wit.com:/data/incoming
cd -
sudo rm -fr $TMP_DIR
sudo rm -fr ../wit-pxeboot-${ARCH}*

View File

@ -5,28 +5,5 @@ menuentry "localboot" {
exit
}
menuentry "debcore-x86_64" {
linux /wit-pxeboot/vmlinuz-amd64 console=tty0 console=ttyS1,115200n8 size=5000
initrd /wit-pxeboot/initramfs-amd64.gz
}
menuentry "debcore-arm64" {
linux /wit-pxeboot/vmlinuz-arm64 console=tty0 console=ttyAMA0,115200n8 size=5000
initrd /wit-pxeboot/initramfs-arm64.gz
}
menuentry "install-x86_64" {
linux /wit-pxeboot/vmlinuz-amd64 console=tty0 console=ttyS1,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export INSTALLEXTRA=wit-config; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1'
initrd /wit-pxeboot/initramfs-amd64.gz
}
menuentry "install-arm64" {
linux /wit-pxeboot/vmlinuz-arm64 console=tty0 console=ttyAMA0,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export INSTALLEXTRA=wit-config; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1'
initrd /wit-pxeboot/initramfs-arm64.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' ---
#
source /boot/grub/grub-addon-amd64.cfg
source /boot/grub/grub-addon-arm64.cfg