artix

commit ad2ccb5ca908aa599f2b5afbbae3bfb5e80d8e57
parent c40bfcb86d112204bdb9585e39c4c91ef7bc85dc
Author: awy <awy@awy.one>
Date:   Sun, 27 Oct 2024 16:50:28 +0300

update

Diffstat:
M
install.sh
 | 
8
++++----
M
post_chroot.sh
 | 
13
++++++-------

2 files changed, 10 insertions(+), 11 deletions(-)
diff --git 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
-  rc-service ntpd start
+  dinitctl start ntpd
   pacman -Sy --confirm
-  basestrap /mnt base openrc seatd-openrc linux-zen linux-zen-headers 
+  basestrap /mnt base dinit seatd-dinit 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
-  rc-service ntpd start
+  dinitctl start ntpd
   pacman -Sy --confirm
-  basestrap /mnt base openrc seatd-openrc udev intel-ucode 
+  basestrap /mnt base dinit seatd-dinit udev intel-ucode 
   UUID_ROOT=$(blkid -s UUID -o value /dev/$root_drive) 
   UUID_BOOT=$(blkid -s UUID -o value /dev/$boot_drive)
   echo "UUID=$UUID_BOOT /boot vfat defaults,noatime 0 2" > /mnt/etc/fstab
diff --git a/post_chroot.sh b/post_chroot.sh
@@ -28,13 +28,13 @@ 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.6.tar.xz"
-  tar -xf "linux-6.10.6.tar.xz"
-  rm -f "linux-6.10.6.tar.xz"
-  mv "linux-6.10.6" "linux"
+  curl -LO "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.5.tar.xz"
+  tar -xf "linux-6.11.5.tar.xz"
+  rm -f "linux-6.11.5.tar.xz"
+  mv "linux-6.11.5" "linux"
   cd "linux"
   mv /usr/src/.config .config
-  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
+  sed -i -e '/^CONFIG_CMDLINE="root=PARTUUID=.*/c\' -e "CONFIG_CMDLINE=\"root=PARTUUID=$PARTUUID_ROOT init=/sbin/dinit-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
@@ -88,8 +88,7 @@ permit nopass keepenv :$_username
 permit nopass keepenv :root
 EOL
 
-pacman -S dhcpcd dhcpcd-openrc --noconfirm
-rc-update add dhcpcd default
+pacman -S dhcpcd dhcpcd-dinit --noconfirm
 
 pacman -S nvidia-open-dkms --noconfirm