diff --git a/3.install.sh b/3.install.sh index 2f1d9eb..3255887 100755 --- a/3.install.sh +++ b/3.install.sh @@ -21,7 +21,7 @@ echo "$_HOSTNAME" > /etc/hostname bootctl --path=/boot install #Создаем пункт загрузки -printf "title Arch Linux\nlinux /vmlinuz-linux\ninitrd /intel-ucode.img\ninitrd /initramfs-linux.img\noptions rd.luks.name=${_LUKS_UUID}=cryptroot rd.luks.data=PARTUUID=${_DATA_PARTUUID} rd.luks.options=${_LUKS_UUID}=header=PARTUUID=${_HEADER_PARTUUID} root=/dev/mapper/cryptroot rw rootflags=subvol=@" > /boot/loader/entries/arch.conf +printf "title Arch Linux\nlinux /vmlinuz-linux\ninitrd /intel-ucode.img\ninitrd /initramfs-linux.img\noptions rd.luks.name=${_LUKS_UUID}=cryptroot rd.luks.data=${_LUKS_UUID}=/dev/disk/by-partuuid/${_DATA_PARTUUID} rd.luks.options=${_LUKS_UUID}=header=/dev/disk/by-partuuid/${_HEADER_PARTUUID} root=/dev/mapper/cryptroot rw rootflags=subvol=@" > /boot/loader/entries/arch.conf # Правим хуки sed -i 's/^HOOKS=(.*/HOOKS=(base systemd autodetect microcode modconf kms keyboard keymap sd-vconsole block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf diff --git a/README.md b/README.md index 8b299d4..fe9041b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ pacman-key --init && pacman-key --populate archlinux && pacman -Sy git --noconfirm && git clone https://git.xkrs.ru/astraleuro/arch-install.git && cd arch-install -mount -t nfs -o nfsvers=4 192.168.15.230:/srv/pacman-cache /var/cache/pacman/pkg +mount -t nfs -o nfsvers=4 192.168.11.105:/srv/pacman-cache /var/cache/pacman/pkg ./1.disks.sh