osi-mk: Changing FSID breaks a few things, fix them

2 files changed, 8 insertions, 3 deletions

diff --git a/osi-mk b/osi-mk
index 6910b0f..1632391 100755
--- a/osi-mk
+++ b/osi-mk
@@ -66,6 +66,10 @@ osi-mk:grub-install() {
 			EOT
 	arch-chroot -- "$arg_mountpoint" sh -c \
 		    'grub-install "$(awk '\''$2 == "/" { print $1 }'\'' </proc/mounts)"'
+}
+
+osi-mk:grub-mkconfig() {
+	local arg_mountpoint=$1
 	arch-chroot -- "$arg_mountpoint" grub-mkconfig -o /boot/grub/grub.cfg
 }
 
@@ -191,13 +195,14 @@ main() {
 			packages=("${arg_packages[@]}")
 			cache_packages=()
 			post_install=(
+				00:osi-mk:genfstab
 				50:osi-mk:directories
+				99:osi-mk:grub-mkconfig
 			)
 			if ! $arg_edit; then
 				packages+=(grub btrfs-progs)
 				post_install+=(
-					00:osi-mk:genfstab
-					99:osi-mk:grub-install
+					98:osi-mk:grub-install
 				)
 			fi
 			for module in "${arg_modules[@]}"; do
diff --git a/osi-mk.d/testuser.sh b/osi-mk.d/testuser.sh
index dd7ffb7..bd1f08a 100644
--- a/osi-mk.d/testuser.sh
+++ b/osi-mk.d/testuser.sh
@@ -13,7 +13,7 @@ testuser:early() {
 	fi
 }
 
-post_install+=(99:testuser:late)
+post_install+=(90:testuser:late)
 testuser:late() {
 	local arg_mountpoint=$1