root/march-chroot:Added cryptroot and rootpart so that the vars can be used there
This commit is contained in:
@@ -120,7 +120,7 @@ cp $CWD/root/march-reboot.sh /mnt/root/march-reboot.sh
|
|||||||
chmod +x /mnt/root/march-chroot.sh
|
chmod +x /mnt/root/march-chroot.sh
|
||||||
chmod +x /mnt/root/march-reboot.sh
|
chmod +x /mnt/root/march-reboot.sh
|
||||||
|
|
||||||
arch-chroot /mnt /root/march-chroot.sh -t $timezone -l $locale -h $hostname -u $username -s $sudogrp
|
arch-chroot /mnt /root/march-chroot.sh -t "$timezone" -l "$locale" -h $hostname" -u "$username" -s "$sudogrp" -c "$cryptroot" -r "$rootpart"
|
||||||
|
|
||||||
umount $bootpart
|
umount $bootpart
|
||||||
swapoff $swappart
|
swapoff $swappart
|
||||||
|
|||||||
@@ -111,7 +111,6 @@ linux /vmlinuz-linux
|
|||||||
initrd /initramfs-linux.img
|
initrd /initramfs-linux.img
|
||||||
options rw cryptdevice=$(blkid $rootpart | cut -d" " -f2 | tr -d \"):cryptroot root=$cryptroot i8042.noloop i8042.nomux i8042.nopnp i8042.reset" > /boot/loader/entries/arch.conf
|
options rw cryptdevice=$(blkid $rootpart | cut -d" " -f2 | tr -d \"):cryptroot root=$cryptroot i8042.noloop i8042.nomux i8042.nopnp i8042.reset" > /boot/loader/entries/arch.conf
|
||||||
|
|
||||||
sed -i "s/march-reboot.sh/\0 -u $username -s $sudogrp/" /etc/systemd/system/march.service
|
sed -i "s/march-reboot.sh/\0 -u \"$username\" -s \"$sudogrp\"/" /etc/systemd/system/march.service
|
||||||
|
|
||||||
systemctl enable march.service
|
systemctl enable march.service
|
||||||
systemctl enable dhcpcd.service
|
|
||||||
|
|||||||
Reference in New Issue
Block a user