installer script: almost done (13)

This commit is contained in:
Daniel Langbein 2021-05-03 16:24:25 +02:00
parent c6ea86a21e
commit 0897da627a
2 changed files with 6 additions and 5 deletions

View File

@ -38,8 +38,8 @@ function build-pkg() {
cd "pkg/${PKG}" || return $? cd "pkg/${PKG}" || return $?
# Build and copy to /home/custompkgs # Build and copy to /home/custompkgs
build-with-makepkg || { # build-with-makepkg || {
# build-with-aurutils || { build-with-aurutils || {
echo "Failed to build package ${PKG}!"; echo "Failed to build package ${PKG}!";
FAILED_PKGS+=("${PKG}"); FAILED_PKGS+=("${PKG}");
} }

View File

@ -110,7 +110,7 @@ function get_default_mount_options() {
;; ;;
EXT4) EXT4)
# https://wiki.archlinux.org/index.php/Ext4#Enabling_metadata_checksums # https://wiki.archlinux.org/index.php/Ext4#Enabling_metadata_checksums
# If the CPU supports SSE 4.2, make sure the crc32c_intel kernel module is loaded (TODO) # If the CPU supports SSE 4.2, make sure the crc32c_intel kernel module is loaded
FS_DEFAULT_MOUNT_OPTIONS+=('metadata_csum') FS_DEFAULT_MOUNT_OPTIONS+=('metadata_csum')
;; ;;
F2FS) F2FS)
@ -315,8 +315,9 @@ function bootloader() {
;; ;;
esac esac
# TODO sed -i "s|^GRUB_CMDLINE_LINUX=.*\$|GRUB_CMDLINE_LINUX=\"cryptdevice=/dev/disk/by-uuid/${LUKS_PART_UUID}:crypt\"|" \
/mnt/etc/default/grub || return $?
arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg || return $?
} }
function main() { function main() {