From f3038cb2b91fb58cf4fd9d94af74d3d2bac00153 Mon Sep 17 00:00:00 2001
From: awy <awy@tutamail.com>
Date: Wed, 7 Aug 2024 21:04:34 +0300
Subject: update

---
 .config        |  8 ++++----
 install.sh     | 10 ++++++----
 post_chroot.sh | 41 +++++++++++++++++++----------------------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/.config b/.config
index 9d99159..91f8358 100644
--- a/.config
+++ b/.config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.10.2 Kernel Configuration
+# Linux/x86 6.10.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240720"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20240802"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140101
+CONFIG_GCC_VERSION=140201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -398,7 +398,7 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_LEGACY_VSYSCALL_XONLY is not set
 CONFIG_LEGACY_VSYSCALL_NONE=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="root=PARTUUID=a243fbce-490d-469c-809f-40939eca3966 init=/sbin/runit-init nvidia_drm.modeset=1 nvidia_drm.fbdev=1 intel_iommu=on"
+CONFIG_CMDLINE="root=PARTUUID=a243fbce-490d-469c-809f-40939eca3966 init=/sbin/openrc-init nvidia_drm.modeset=1 nvidia_drm.fbdev=1 intel_iommu=on"
 # CONFIG_CMDLINE_OVERRIDE is not set
 # CONFIG_MODIFY_LDT_SYSCALL is not set
 # CONFIG_STRICT_SIGALTSTACK_SIZE is not set
diff --git a/install.sh b/install.sh
index 6b49879..5c4de70 100755
--- a/install.sh
+++ b/install.sh
@@ -35,16 +35,16 @@ mkdir /mnt/home
 if [ "$_kernelflag" -eq 1 ]; then
   mkdir /mnt/boot/efi
   mount /dev/$boot_drive /mnt/boot/efi
-  sv up ntpd
+  rc-service ntpd start
   pacman -Sy --confirm
-  basestrap /mnt base runit seatd-runit linux-zen linux-zen-headers 
+  basestrap /mnt base openrc seatd-openrc linux-zen linux-zen-headers 
   fstabgen -U /mnt >> /mnt/etc/fstab
   cp post_chroot.sh /mnt
 elif [ "$_kernelflag" -eq 2 ]; then
   mount /dev/$boot_drive /mnt/boot
-  sv up ntpd
+  rc-service ntpd start
   pacman -Sy --confirm
-  basestrap /mnt base runit seatd-runit udev intel-ucode 
+  basestrap /mnt base openrc seatd-openrc udev intel-ucode 
   fstabgen -U /mnt >> /mnt/etc/fstab
   cp post_chroot.sh /mnt
 else
@@ -52,6 +52,7 @@ else
   exit 1
 fi
 
+export disk_drive
 export root_drive
 export boot_drive
 export _hostname
@@ -59,5 +60,6 @@ export _username
 export _rootpasswd
 export _userpasswd
 export _kernelflag
+export partitions
 
 artix-chroot /mnt ./post_chroot.sh
diff --git a/post_chroot.sh b/post_chroot.sh
index db655cc..a03eb7e 100755
--- a/post_chroot.sh
+++ b/post_chroot.sh
@@ -28,28 +28,25 @@ if [ "$_kernelflag" -eq 1 ]; then
 elif [ "$_kernelflag" -eq 2 ]; then
   pacman -S efibootmgr --noconfirm
   cd /usr/src/
-  curl -LO "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.10.2.tar.xz"
-  tar -xf "linux-6.10.2.tar.xz"
-  rm -f "linux-6.10.2.tar.xz"
-  cd "linux-6.10.2"
+  curl -LO "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.10.3.tar.xz"
+  tar -xf "linux-6.10.3.tar.xz"
+  rm -f "linux-6.10.3.tar.xz"
+  cd "linux-6.10.3"
   curl -LO "https://codeberg.org/awy/artix/raw/branch/minimal/.config"
-  sed -i -e '/^CONFIG_CMDLINE="root=PARTUUID=.*/c\' -e "CONFIG_CMDLINE=\"root=PARTUUID=$PARTUUID_ROOT\"" .config
-  mkdir /etc/modules-load.d
-  cat <<EOL >> /etc/modules-load.d/video.conf
-  nvidia
-  nvidia_modeset
-  nvidia_uvm
-  nvidia_drm
-EOL
+  sed -i -e '/^CONFIG_CMDLINE="root=PARTUUID=.*/c\' -e "CONFIG_CMDLINE=\"root=PARTUUID=$PARTUUID_ROOT init=/sbin/openrc-init nvidia_drm.modeset=1 nvidia_drm.fbdev=1 intel_iommu=on\"" .config
   pacman -S bc perl bison make diffutils gcc flex rsync --noconfirm
+  make oldconfig
   make menuconfig
-  #make -j$(nproc)
-  #make modules
-  #make modules_install
-  #make headers
-  #make headers_install
-  #cp arch/x86/boot/bzImage /boot/EFI/BOOT/BOOTX64.EFI
-  #efibootmgr -c -d /dev/nvme0n1 -p 1 -L "ARTIX" -l '\EFI\BOOT\BOOTX64.EFI'
+  make -j$(nproc)
+  make modules
+  make modules_install
+  make headers
+  make headers_install
+  mkdir -p /boot/EFI/BOOT
+  cp arch/x86/boot/bzImage /boot/EFI/BOOT/BOOTX64.EFI
+  ln -s /lib/modules/6.10.3/build/ /usr/src/linux
+  _diskdrivewop="${diskdrive%p}"
+  efibootmgr -c -d /dev/$_diskdrivewop -p ${partition_array[0]} -L "linux" -l '\EFI\BOOT\BOOTX64.EFI'
 else
   printf ${LIGHTRED}"Wrong kernelflag value.${NoColor}\n"
   exit 1
@@ -73,10 +70,10 @@ permit nopass keepenv :$_username
 permit nopass keepenv :root
 EOL
 
-pacman -S dhcpcd dhcpcd-runit --noconfirm
-ln -s /etc/runit/sv/dhcpcd /etc/runit/runsvdir/default
+pacman -S dhcpcd dhcpcd-openrc --noconfirm
+rc-update add dhcpcd default
 
-pacman -S nvidia-open-dkms nvidia-utils trizen --noconfirm
+pacman -S nvidia-open-dkms --noconfirm
 
 if [ "$_kernelflag" -eq 1 ]; then
   grub-mkconfig -o /boot/grub/grub.cfg
-- 
cgit v1.2.3