Add installer to isov1.7.6

4 files changed, 25 insertions, 8 deletions

diff --git a/scripts/install.sh b/iso/install.sh
index 89ee11b..89ee11b 100755
--- a/scripts/install.sh
+++ b/iso/install.sh
diff --git a/scripts/mkiso.sh b/iso/mkiso.sh
index 264b802..925c52a 100755
--- a/scripts/mkiso.sh
+++ b/iso/mkiso.sh
@@ -9,7 +9,7 @@ XI_ARGS=""
 
 chroot=/tmp/chroot
 isoroot=/tmp/iso
-iso_pkgs="linux linux-firmware base dracut grub bash xipkg squashfs-tools lvm2 cryptsetup networkmanager stty"
+iso_pkgs="linux linux-firmware base dracut grub bash xipkg squashfs-tools lvm2 cryptsetup networkmanager stty xitui"
 
 create_basesystem () {
     xi $XI_ARGS sync
@@ -29,9 +29,12 @@ EOF
 127.0.1.1   $hostname.local $hostname
 EOF
 
-    xichroot $SYSROOT passwd 
+    cp -r ./root $chroot/
 
-    xichroot "$chroot"
+    cat > $chroot/etc/conf.d/agetty << EOF
+agetty_options="--autologin root --noclear"
+EOF
+    
 }
 
 build_initramfs () {
@@ -63,9 +66,7 @@ default 1
 
 label 1
     kernel /vmlinuz
-    append initrd=/initrd.img splash console=tty0 console=ttyS0,9600 root=live:CDLABEL=xilinux rd.live.dir=/ rd.live.squashimg=filesystem.squashfs rd.live.debug=1
-
-
+    append initrd=/initrd.img splash console=tty0 console=ttyS0,9600 root=live:CDLABEL=xilinux rd.live.dir=/ rd.live.squashimg=filesystem.squashfs rd.live.debug=1 quiet
 
 EOF
 
diff --git a/iso/root/.profile b/iso/root/.profile
new file mode 100644
index 0000000..a15c12b
--- /dev/null
+++ b/iso/root/.profile
@@ -0,0 +1,9 @@
+splash () {
+    clear
+    echo "Welcome to xilinux"
+}
+
+[ "$(fgconsole 2>/dev/null)" = "1" ] && exec $HOME/installer.sh
+
+splash
+
diff --git a/scripts/installer.sh b/iso/root/installer.sh
index 589574d..ed20bf9 100755
--- a/scripts/installer.sh
+++ b/iso/root/installer.sh
@@ -7,7 +7,6 @@
 logfile="installer.log"
 default_packages="base linux xipkg dracut grub mksh sudo neofetch vim tzdata"
 additional_services="networkmanager xorg iwd"
-
 list_disks () {
     lsblk -r | while read -r line; do
         set - $line
@@ -37,7 +36,14 @@ partition_disk () {
     t_msg "Partitioned $1!"
 }
 
+welcome_splash () {
+    t_dialogue "Welcome to the xilinux installer" "<Continue>"
+
+}
+
+
 partition_disks () {
+    # need to use eval to work with spaces in line names
     eval "t_radio 'Select install disk' $(list_disks)"
     local selected=$(echo $T_RESULT | cut -d' ' -f1)
 
@@ -277,7 +283,8 @@ t_init
 t_no_cur
 checkroot 
 
-steps="partition_disks
+steps="welcome_splash
+partition_disks
 format_disks
 mount_disks
 bootstrap_system