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

change some echo's to info's 

Signed-off-by: Dan Johansen <strit@manjaro.org>
This commit is contained in:
Dan Johansen 2021-08-16 01:21:21 +02:00
parent 95350afa4d
commit d6b6bf9718
No known key found for this signature in database
GPG Key ID: 084A7FC0035B1D49
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manjaro-arm-installer
View File

@ -2,7 +2,7 @@
# Set globals # Set globals
# ***************************** # *****************************
VERSION="1.4.6" VERSION="1.4.7"
# ***************************** # *****************************
TMPDIR=/var/tmp/manjaro-arm-installer TMPDIR=/var/tmp/manjaro-arm-installer
ARCH='aarch64' ARCH='aarch64'
@ -374,11 +374,11 @@ cleanup () {
# set UUID for boot partition in fstab # set UUID for boot partition in fstab
BOOT_PARTUUID=$(lsblk -p -o NAME,PARTUUID | grep ${DEV_NAME}${SDDEV}1 | awk '{print $2}') BOOT_PARTUUID=$(lsblk -p -o NAME,PARTUUID | grep ${DEV_NAME}${SDDEV}1 | awk '{print $2}')
sed -i "s/LABEL=BOOT_MNJRO/PARTUUID=$BOOT_PARTUUID/g" $TMPDIR/root/etc/fstab sed -i "s/LABEL=BOOT_MNJRO/PARTUUID=$BOOT_PARTUUID/g" $TMPDIR/root/etc/fstab
echo "Set boot partition to $BOOT_PARTUUID in /etc/fstab..." info "Set boot partition to $BOOT_PARTUUID in /etc/fstab..."
# Change boot script and fstab to root partition UUID # Change boot script and fstab to root partition UUID
ROOT_PARTUUID=$(lsblk -p -o NAME,PARTUUID | grep ${DEV_NAME}${SDDEV}2 | awk '{print $2}') ROOT_PARTUUID=$(lsblk -p -o NAME,PARTUUID | grep ${DEV_NAME}${SDDEV}2 | awk '{print $2}')
echo "Set root partition to $ROOT_PARTUUID in the relevant boot script and /etc/fstab..." info "Set root partition to $ROOT_PARTUUID in the relevant boot script and /etc/fstab..."
if [ -f $TMPDIR/boot/extlinux/extlinux.conf ]; then if [ -f $TMPDIR/boot/extlinux/extlinux.conf ]; then
sed -i "s/LABEL=ROOT_MNJRO/PARTUUID=$ROOT_PARTUUID/g" $TMPDIR/boot/extlinux/extlinux.conf sed -i "s/LABEL=ROOT_MNJRO/PARTUUID=$ROOT_PARTUUID/g" $TMPDIR/boot/extlinux/extlinux.conf
elif [ -f $TMPDIR/boot/efi/extlinux/extlinux.conf ]; then elif [ -f $TMPDIR/boot/efi/extlinux/extlinux.conf ]; then
@ -724,7 +724,7 @@ else
fi fi
if [ ! -z "$HOSTNAME" ]; then if [ ! -z "$HOSTNAME" ]; then
dialog --clear --title "Manjaro ARM Installer" \ dialog --clear --title "Manjaro ARM Installer v${VERSION}" \
--yesno "Is the below information correct: --yesno "Is the below information correct:
Device = $DEVICE Device = $DEVICE
Edition = $EDITION Edition = $EDITION