add --old-chroot option, pull in installclass

build-scripts/ci-build-mock.sh

@@ -15,12 +15,13 @@ then
     exit
 fi
 wget -O tigeros.ks https://raw.githubusercontent.com/RITlug/TigerOS/master/tigeros.ks
-mock -r fedora-26-x86_64 --init
-mock -r fedora-26-x86_64 --copyin tigeros.ks ./tigeros.ks
-mock -r fedora-26-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart
-mock -r fedora-26-x86_64 --chroot "livemedia-creator --ks tigeros.ks --no-virt --resultdir /var/lmc --project TigerOS-Live --make-iso --volid TigerOS --iso-only --iso-name TigerOS.iso --releasever 26 --title TigerOS-live --macboot"
+mock --old-chroot -r fedora-26-x86_64 --init
+mock --old-chroot -r fedora-26-x86_64 --copyin tigeros.ks ./tigeros.ks
+mock --old-chroot -r fedora-26-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart
+mock --old-chroot -r fedora-26-x86_64 --install https://tigeros.ritlug.com/packages/x86_64/anaconda-installclass-tigeros-26-1.fc26.x86_64.rpm
+mock --old-chroot -r fedora-26-x86_64 --chroot "livemedia-creator --ks tigeros.ks --no-virt --resultdir /var/lmc --project TigerOS-Live --make-iso --volid TigerOS --iso-only --iso-name TigerOS.iso --releasever 26 --title TigerOS-live --macboot"
 rm -rf /srv/isos/TigerOS-$(date +%Y%m%d).iso
-mock -r fedora-26-x86_64 --copyout /var/lmc/TigerOS.iso /srv/isos/TigerOS-$(date +%Y%m%d).iso 
+mock --old-chroot-r fedora-26-x86_64 --copyout /var/lmc/TigerOS.iso /srv/isos/TigerOS-$(date +%Y%m%d).iso 
 rm -rf /var/lib/mock/
 cd /srv/isos
 rm -rf CHECKSUM512-$(date +%Y%m%d)

make-iso.sh

@@ -2,8 +2,8 @@
 set -eu
 
 ####################################################################
-# TigerOS Build Script 	                                           #
-# @author: Aidan Kahrs	                                           #
+# TigerOS Build Script                                             #
+# @author: Aidan Kahrs                                             #
 #                                                                  #
 # Usage: sudo bash make-iso.sh                                     #
 #                                                                  #
@@ -18,13 +18,14 @@ then
     echo "Please run this script as root (sudo $@$0)."
     exit
 fi
-mock -r fedora-26-x86_64 --init
-mock -r fedora-26-x86_64 --copyin kickstarts/tigeros.ks ./tigeros.ks
-mock -r fedora-26-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart
+mock --old-chroot -r fedora-26-x86_64 --init
+mock --old-chroot -r fedora-26-x86_64 --copyin tigeros.ks ./tigeros.ks
+mock --old-chroot -r fedora-26-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart
+mock --old-chroot -r fedora-26-x86_64 --install https://tigeros.ritlug.com/packages/x86_64/anaconda-installclass-tigeros-26-1.fc26.x86_64.rpm
 echo "${green}Beginning build process${reset}"
 #setenforce 0
 #livemedia-creator --ks tigeros.ks --no-virt --resultdir /var/lmc --project TigerOS-Live --make-iso --volid TigerOS --iso-only --iso-name TigerOS.iso --releasever 26 --title TigerOS-live --macboot
-mock -r fedora-26-x86_64 --chroot "livemedia-creator --ks tigeros.ks --no-virt --resultdir /var/lmc --project \"Fedora TigerOS-Live\" --make-iso --volid TigerOS --iso-only --iso-name TigerOS.iso --releasever 26 --title TigerOS-live --macboot"
-mock -r fedora-26-x86_64 --copyout /var/lmc/TigerOS.iso TigerOS.iso
+mock --old-chroot -r fedora-26-x86_64 --chroot "livemedia-creator --ks tigeros.ks --no-virt --resultdir /var/lmc --project \"Fedora TigerOS-Live\" --make-iso --volid TigerOS --iso-only --iso-name TigerOS.iso --releasever 26 --title TigerOS-live --macboot"
+mock --old-chroot -r fedora-26-x86_64 --copyout /var/lmc/TigerOS.iso TigerOS.iso
 echo "${green}ISO saved to $(pwd)/TigerOS.iso${reset}"
 #setenforce 1