From 6149b5327a4709b915ef2a8d923f9d448794fc89 Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Sat, 9 Oct 2021 22:30:08 +0200 Subject: [PATCH] fix a couple of rootfs paths Signed-off-by: Dan Johansen --- manjaro-arm-installer | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 5a2f03f..7adaecc 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -232,19 +232,19 @@ create_install() { sed -i 's/^/rootflags=subvol=@ rootfstype=btrfs /' $TMPDIR/boot/cmdline.txt elif [ -f $TMPDIR/boot/boot.txt ]; then sed -i 's/setenv bootargs/& rootflags=subvol=@/' $TMPDIR/boot/boot.txt - $NSPAWN $TMPDIR mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d /boot/boot.txt /boot/boot.scr + $NSPAWN $TMPDIR/root mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d /boot/boot.txt /boot/boot.scr fi echo "LABEL=ROOT_MNJRO / btrfs subvol=@,compress=zstd,defaults,noatime 0 0" >> $TMPDIR/root/etc/fstab echo "LABEL=ROOT_MNJRO /home btrfs subvol=@home,compress=zstd,defaults,noatime 0 0" >> $TMPDIR/root/etc/fstab sed -i '/^MODULES/{s/)/ btrfs)/}' $TMPDIR/root/etc/mkinitcpio.conf - $NSPAWN $TMPDIR mkinitcpio -P 1> /dev/null 2>&1 + $NSPAWN $TMPDIR/root mkinitcpio -P 1> /dev/null 2>&1 ;; f2fs) info "Adding f2fs support to system..." - $NSPAWN $TMPDIR pacman -S f2fs-tools --noconfirm 1> /dev/null 2>&1 + $NSPAWN $TMPDIR/root pacman -S f2fs-tools --noconfirm 1> /dev/null 2>&1 echo "LABEL=ROOT_MNJRO / f2fs defaults,noatime,compress_algorithm=zstd 0 0" >> $TMPDIR/root/etc/fstab sed -i '/^MODULES/{s/)/ f2fs)/}' $TMPDIR/root/etc/mkinitcpio.conf - $NSPAWN $TMPDIR mkinitcpio -P 1> /dev/null 2>&1 + $NSPAWN $TMPDIR/root mkinitcpio -P 1> /dev/null 2>&1 ;; *) info "Adding ext4 support to system..."