jess
/
manjaro-arm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

update script

See merge request manjaro-arm/applications/manjaro-arm-installer!9
This commit is contained in:
Frede H 2025-01-14 07:42:44 +00:00
parent 9255172998 e4107c4815
commit aee0d0da8d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manjaro-arm-installer
View File

@ -2,7 +2,7 @@
# Set globals # Set globals
# ***************************** # *****************************
VERSION="1.5.3" VERSION="1.5.4"
# ***************************** # *****************************
TMPDIR=/var/tmp/manjaro-arm-installer TMPDIR=/var/tmp/manjaro-arm-installer
ARCH='aarch64' ARCH='aarch64'
@ -69,12 +69,13 @@ for i in "${DEPENDENCIES[@]}"; do
done done
if [[ "$CARCH" != "aarch64" ]]; then if [[ "$CARCH" != "aarch64" ]]; then
if [ ! -f "/usr/lib/binfmt.d/qemu-aarch64-static.conf" ]; then if [ ! -f "/usr/lib/binfmt.d/qemu-aarch64-static.conf" ]; then
echo "qemu-aarch64-static.conf file is missing. Please install the relevant package." echo "qemu-aarch64-static.conf file is missing. Please install the relevant package."
exit 1 exit 1
fi
# restart systemd-binfmt on x86_64
systemctl restart systemd-binfmt
fi fi
fi
# Functions # Functions
msg() { msg() {
@ -157,7 +158,7 @@ create_install() {
$NSPAWN $TMPDIR/root pacman-key --populate archlinuxarm manjaro manjaro-arm 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root pacman-key --populate archlinuxarm manjaro manjaro-arm 1> /dev/null 2>&1
info "Setting target branch ${BRANCH}..." info "Setting target branch ${BRANCH}..."
sed -i 's|.*Branch.*|Branch = '${BRANCH}'|g' $TMPDIR/root/etc/pacman-mirrors.conf sed -i 's|.*Branch =.*|Branch = '${BRANCH}'|g' $TMPDIR/root/etc/pacman-mirrors.conf
info "Generating mirrorlist..." info "Generating mirrorlist..."
$NSPAWN $TMPDIR/root pacman-mirrors -f10 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root pacman-mirrors -f10 1> /dev/null 2>&1
@ -299,7 +300,7 @@ create_install() {
rm -f $TMPDIR/root/usr/bin/qemu-aarch64-static rm -f $TMPDIR/root/usr/bin/qemu-aarch64-static
rm -f $ROOTFS_IMG/rootfs_$ARCH/MANJARO-ARM-IMAGE-BUILD rm -f $ROOTFS_IMG/rootfs_$ARCH/MANJARO-ARM-IMAGE-BUILD
rm -f $TMPDIR/root/var/cache/pacman/pkg/* rm -f $TMPDIR/root/var/cache/pacman/pkg/*
rm -f $TMPDIR/root/var/log/* rm -rf $TMPDIR/root/var/log/*
rm -rf $ROOTFS_IMG/rootfs_$ARCH/var/log/journal/* rm -rf $ROOTFS_IMG/rootfs_$ARCH/var/log/journal/*
rm -f $TMPDIR/root/etc/*.pacnew rm -f $TMPDIR/root/etc/*.pacnew
rm -f $TMPDIR/root/usr/lib/systemd/system/systemd-firstboot.service rm -f $TMPDIR/root/usr/lib/systemd/system/systemd-firstboot.service