From bc5cdd7f0a7bf1d0f1478ade5085b2089a21515f Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Sat, 21 Jan 2023 14:40:55 +0000
Subject: Add full chroot for mkiso

---
 iso/mkiso.sh | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'iso/mkiso.sh')

diff --git a/iso/mkiso.sh b/iso/mkiso.sh
index 84a9782..6fe2914 100755
--- a/iso/mkiso.sh
+++ b/iso/mkiso.sh
@@ -5,7 +5,9 @@ ISO_LABEL="XILINUX"
 PUBLISHER="davidovski"
 SYSLINUX_VER=6.04-pre1
 
-XI_ARGS="-yq"
+TO_MIRROR="file:///var/lib/xib/repo"
+
+XI_ARGS="-yv"
 
 WORKDIR=/tmp/xiiso
 
@@ -20,9 +22,10 @@ grub_mod="all_video disk part_gpt part_msdos linux normal configfile search sear
 mkdir -p $WORKDIR
 
 create_basesystem () {
-    xi $XI_ARGS sync
-    xi $XI_ARGS -r "$chroot" bootstrap
-    xi $XI_ARGS -r "$chroot" install "$iso_pkgs"
+    mkdir -p $chroot
+    xipkg $XI_ARGS sync
+    xipkg $XI_ARGS -r "$chroot" bootstrap
+    xipkg $XI_ARGS -r "$chroot" install "$iso_pkgs"
 }
 
 configure_system() {
@@ -117,8 +120,9 @@ EOF
 }
 
 build_iso () {
+    local name=${1:-netinst}
     mksquashfs $chroot $isoroot/filesystem.squashfs -noappend -no-progress -e "/proc/*" -e "/dev/*" -e "/sys/*" 
-    xorrisofs -output ${ISO_NAME}.iso \
+    xorrisofs -output ${name}.iso \
             -joliet \
             -rational-rock \
             -sysid LINUX \
@@ -136,9 +140,21 @@ build_iso () {
             $isoroot
 
 
-    printf "ISO written to $ISO_NAME.iso\n"
+    printf "ISO written to $name.iso\n"
 }
 
+create_full_iso () {
+    xipkg $XI_ARGS -r $chroot mirror
+
+    cat > $chroot/etc/xipkg.conf << EOF
+include /etc/xipkg.d/default.conf
+sources {
+    local file:///var/lib/xipkg/mirror/
+}
+default_cmd install
+EOF
+    build_iso "full"
+}
 
 [ "$#" = 0 ] && {
     steps="
@@ -149,6 +165,7 @@ build_iso () {
     install_syslinux 
     build_grub_efi 
     build_iso
+    create_full_iso
     "
 } || {
     steps="$*"
-- 
cgit v1.2.1