From 0bc3dec48918b1b81e0897965bf377e214d0a155 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 6 Nov 2023 20:55:39 +0100 Subject: [PATCH] change DESTDIR to /mnt/install in installer --- usr/lib/archboot/cpio/hooks/installer | 2 +- usr/lib/archboot/installer/common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/lib/archboot/cpio/hooks/installer b/usr/lib/archboot/cpio/hooks/installer index a43ba7c10..d3684d0ef 100644 --- a/usr/lib/archboot/cpio/hooks/installer +++ b/usr/lib/archboot/cpio/hooks/installer @@ -4,7 +4,7 @@ _run () { - _dir /install + _dir /mnt/install _map _binary genfstab arch-chroot pacstrap \ archboot-binary-check.sh archboot-not-installed.sh hwdetect _file_rename /usr/bin/archboot-setup.sh /usr/bin/setup diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh index 667890674..80224aaf9 100644 --- a/usr/lib/archboot/installer/common.sh +++ b/usr/lib/archboot/installer/common.sh @@ -13,7 +13,7 @@ _FINDMNT="findmnt -vno SOURCE" # don't use _DESTDIR=/mnt because it's intended to mount other things there! # check first if bootet in archboot if grep -qw '^archboot' /etc/hostname; then - _DESTDIR="/install" + _DESTDIR="/mnt/install" _NSPAWN="systemd-nspawn -q -D ${_DESTDIR}" else _DESTDIR="/"