From 5649b956438271211f48617b5e19fae438d915ab Mon Sep 17 00:00:00 2001 From: whoisYoges Date: Sun, 10 Jul 2022 22:49:20 +0545 Subject: [PATCH] chroot dependencies fixed --- base/Packages-Root | 1 + base/profile.conf | 2 +- base/root-overlay/usr/local/bin/final.sh | 29 ++++++++ .../root-overlay/usr/local/bin/metis-sideload | 68 +++++++------------ .../usr/local/bin/post_install.sh | 11 ++- 5 files changed, 66 insertions(+), 45 deletions(-) create mode 100755 base/root-overlay/usr/local/bin/final.sh mode change 100644 => 100755 base/root-overlay/usr/local/bin/post_install.sh diff --git a/base/Packages-Root b/base/Packages-Root index 13cd53f..a2bbe02 100644 --- a/base/Packages-Root +++ b/base/Packages-Root @@ -3,4 +3,5 @@ mkinitcpio-nfs-utils squashfs-tools grub +vim artix-live-@initsys@ diff --git a/base/profile.conf b/base/profile.conf index 2e0efa8..747338c 100644 --- a/base/profile.conf +++ b/base/profile.conf @@ -6,7 +6,7 @@ # connmand or NetworkManager is added to the pkglist dynamicly # only added if in array, these pkgs have no list entry -SERVICES=('acpid' 'cronie' 'metalog' 'NetworkManager') +SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'NetworkManager') ################# live-session ################# diff --git a/base/root-overlay/usr/local/bin/final.sh b/base/root-overlay/usr/local/bin/final.sh new file mode 100755 index 0000000..d7393ce --- /dev/null +++ b/base/root-overlay/usr/local/bin/final.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env sh + +rm -rf /mnt/post_install.sh +sleep 3s +clear +echo -ne " +__________________________________________________________________________________________________________ +| Thanks For Choosing Metis Linux! | +| | +| +-+-+-+-+-+ +-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+ | +| |M|a|g|i|c| |M|e|t|i|s| |I|n|s|t|a|l|l|e|r| | +| +-+-+-+-+-+ +-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+ | +| | +|---------------------------------------------------------------------------------------------------------| +| INSTALLATION SUCCESSFUL! | +|---------------------------------------------------------------------------------------------------------| +| Metis Linus Installation Completed. | +| Check: https://github.com/metis-os for details or visit https://metislinux.org | +|---------------------------------------------------------------------------------------------------------| +|_________________________________________________________________________________________________________| + +" +echo "Metis Linux Installation Finished!!!" +echo "Umounting all the drives" +umount -R /mnt +echo "And then rebooting in 10 seconds!!!" +echo "After Reboot login your your username and password and type startx to start GUI." +sleep 10s +reboot diff --git a/base/root-overlay/usr/local/bin/metis-sideload b/base/root-overlay/usr/local/bin/metis-sideload index fdfaac8..9a61f3a 100755 --- a/base/root-overlay/usr/local/bin/metis-sideload +++ b/base/root-overlay/usr/local/bin/metis-sideload @@ -147,54 +147,38 @@ clear lsblk sleep 3s clear -echo "Installing Base system with zen kernel!!!" +echo "Installing Base system" sleep 2s -basestrap /mnt base base-devel runit elogind-runit linux-zen +basestrap /mnt base base-devel runit elogind-runit +sleep 2s +echo "Installing Kernel" + basestrap /mnt linux-zen linux-firmware linux-zen-headers clear echo "generating fstab file" -fstabgen -U /mnt >> /mnt/etc/fstab +fstabgen -U /mnt > /mnt/etc/fstab sleep 1s clear echo "Checking Fstab Contents" cat /mnt/etc/fstab sleep 2s -echo "Copying config files" -mv /usr/local/bin/os-release /mnt/ -mv /usr/local/bin/grub /mnt/ -mv /usr/local/bin/xinitrc /mnt/ -cp -r /usr/local/bin/pacman.conf /mnt/ -cp -r /usr/local/bin/mirrorlist /mnt/ -# cp -r /usr/local/bin/arch-mirrorlist /mnt/ -cp -r /usr/local/bin/metis-mirrorlist /mnt/ -cp -r /usr/local/bin/init.vim /mnt/ -cp -r /usr/local/bin/zshrc /mnt/ -cp -r /usr/local/bin/picom.conf /mnt/ -sleep 2s -echo "Working now in live environment!" -cp/usr/local/bin/post_install.sh -artix-chroot /mnt ./post_install.sh - -# After Installation -rm -rf /mnt/post_install.sh +echo "Copying config files to new system" +cp /usr/bin/artix-chroot /usr/bin/metis-chroot +cp /usr/local/bin/post_install.sh /mnt +cp /usr/local/bin/os-release /mnt +cp /usr/local/bin/grub /mnt +cp /usr/local/bin/xinitrc /mnt +cp /usr/local/bin/pacman.conf /mnt +cp /usr/local/bin/mirrorlist /mnt +cp /usr/local/bin/metis-mirrorlist /mnt +cp /usr/local/bin/init.vim /mnt +cp /usr/local/bin/zshrc /mnt +cp /usr/local/bin/picom.conf /mnt +echo "Checking configs in system" +ls /mnt +sleep 5s clear -echo -ne " -__________________________________________________________________________________________________________ -| Thanks For Choosing Metis Linux! | -| | -| +-+-+-+-+-+ +-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+ | -| |M|a|g|i|c| |M|e|t|i|s| |I|n|s|t|a|l|l|e|r| | -| +-+-+-+-+-+ +-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+ | -| | -|---------------------------------------------------------------------------------------------------------| -| INSTALLATION SUCCESSFUL! | -|---------------------------------------------------------------------------------------------------------| -| Metis Linus Installation Completed. | -| Check: https://github.com/metis-os for details or visit https://metislinux.org | -|---------------------------------------------------------------------------------------------------------| -|_________________________________________________________________________________________________________| - -" -echo "Metis Linux Installation Finished!!!" -echo "Umount all the drives using command: umount -R /mnt" -echo "And then reboot using command: reboot" -echo "After Reboot login your your username and password and type startx to start GUI." +echo "First Phase Completed!" +echo "Entering into Second Phase of Installation..." +echo "run the following command to start second phase" +echo "1. metis-chroot /mnt" +echo "2. ./post_install.sh" \ No newline at end of file diff --git a/base/root-overlay/usr/local/bin/post_install.sh b/base/root-overlay/usr/local/bin/post_install.sh old mode 100644 new mode 100755 index dbec88b..afc97e9 --- a/base/root-overlay/usr/local/bin/post_install.sh +++ b/base/root-overlay/usr/local/bin/post_install.sh @@ -51,7 +51,7 @@ clear echo "Set up your hostname!" echo "Enter your computer name: " read -r hostname -echo $hostname > /etc/hostname +echo "$hostname" > /etc/hostname echo "Checking hostname (/etc/hostname)" cat /etc/hostname sleep 1s @@ -165,4 +165,11 @@ elif grep -E "Integrated Graphics Controller" <<< ${gpu_type}; then elif grep -E "Intel Corporation UHD" <<< ${gpu_type}; then pacman -S --needed --noconfirm libva-intel-driver libvdpau-va-gl vulkan-intel libva-intel-driver libva-utils fi -sleep 2 +sleep 2s +clear +echo "Second Phase Completed!" +echo "Entering into Final Phase of Installation..." +echo "run the following commands to start final phase " +echo "1. exit" +echo "2. final.sh" +sleep 5s \ No newline at end of file