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

set PARTUUID's in fstab and bootscripts

This commit is contained in:
Dan Johansen 2021-04-15 17:32:43 +02:00
parent 21d122dc4e
commit 2e183130c7
No known key found for this signature in database
GPG Key ID: 084A7FC0035B1D49
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
manjaro-arm-installer
View File

@ -355,6 +355,29 @@ cleanup () {
post_crypt post_crypt
fi fi
# edit boot files and fstab
# set UUID for boot partition in fstab
BOOT_PARTUUID=$(lsblk -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
echo "Set boot partition to $BOOT_PARTUUID in /etc/fstab..."
# Change boot script and fstab to root partition UUID
ROOT_PARTUUID=$(lsblk -o NAME,PARTUUID | grep ${DEV_NAME}${SDDEV}2 | awk '{print $2}')
if [ -f $TMPDIR/boot/extlinux/extlinux.conf ]; then
sed -i "s/LABEL=ROOT_MNJRO/PARTUUID=$ROOT_PARTUUID/g" $TMPDIR/boot/extlinux/extlinux.conf
elif [ -f $TMPDIR/boot/boot.ini ]; then
sed -i "s/LABEL=ROOT_MNJRO/PARTUUID=$ROOT_PARTUUID/g" $TMPDIR/boot/boot.ini
elif [ -f $TMPDIR/boot/uEnv.ini ]; then
sed -i "s/LABEL=ROOT_MNJRO/PARTUUID=$ROOT_PARTUUID/g" $TMPDIR/boot/uEnv.ini
elif [ -f $TMPDIR/boot/cmdline.txt ]; then
sed -i "s/LABEL=ROOT_MNJRO/PARTUUID=$ROOT_PARTUUID/g" $TMPDIR/boot/cmdline.txt
fi
echo "Set root partition to $ROOT_PARTUUID in the relevant boot script..."
sed -i "s/LABEL=ROOT_MNJRO/PARTUUID=$ROOT_PARTUUID/g" $TMPDIR/root/etc/fstab
echo "Set root partition to $ROOT_PARTUUID in /etc/fstab if applicable..."
sync
#clean up #clean up
if [[ "$FSTYPE" = "btrfs" ]]; then if [[ "$FSTYPE" = "btrfs" ]]; then
umount $TMPDIR/root/home umount $TMPDIR/root/home
@ -593,8 +616,8 @@ fi
if [[ "$DEVICE" = "pbpro" ]] && [[ "$FSTYPE" != "btrfs" ]]; then if [[ "$DEVICE" = "pbpro" ]] && [[ "$FSTYPE" != "btrfs" ]]; then
CRYPT=$(dialog --clear --title "Manjaro ARM Installer" \ CRYPT=$(dialog --clear --title "Manjaro ARM Installer" \
--menu "[Experimental!] Do you want encryption on root partition?" 10 90 10 \ --menu "[Experimental!] Do you want encryption on root partition?" 10 90 10 \
"yes" "Yes, please" \
"no" "No, thanks" \ "no" "No, thanks" \
"yes" "Yes, please" \
3>&1 1>&2 2>&3 3>&-) 3>&1 1>&2 2>&3 3>&-)
fi fi
@ -692,7 +715,7 @@ if [ ! -z "$HOSTNAME" ]; then
Locale = $LOCALE Locale = $LOCALE
TTY Keyboard layout = $CLIKEYMAP TTY Keyboard layout = $CLIKEYMAP
X11 Keyboard layout = $X11KEYMAP X11 Keyboard layout = $X11KEYMAP
Hostname = $HOSTNAME" 20 70 \ Hostname = $HOSTNAME" 25 70 \
3>&1 1>&2 2>&3 3>&- 3>&1 1>&2 2>&3 3>&-
else else
clear clear