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

fix boot files on btrfs filesystem

This commit is contained in:
Dan Johansen 2021-04-15 16:50:35 +02:00
parent 5f96ab45ef
commit 21d122dc4e
No known key found for this signature in database
GPG Key ID: 084A7FC0035B1D49
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manjaro-arm-installer
View File

@ -327,9 +327,7 @@ prepare_card () {
cleanup () { cleanup () {
msg "Writing bootloader and cleaning up after install..." msg "Writing bootloader and cleaning up after install..."
# Move boot files # Move boot files
if [[ "$FSTYPE" != "btrfs" ]]; then
mv $TMPDIR/root/boot/* $TMPDIR/boot mv $TMPDIR/root/boot/* $TMPDIR/boot
fi
# Flash bootloader # Flash bootloader
case "$DEVICE" in case "$DEVICE" in
oc2) oc2)
@ -459,7 +457,7 @@ fi
if [ ! -z "$EDITION" ]; then if [ ! -z "$EDITION" ]; then
USER=$(dialog --clear --title "Manjaro ARM Installer" \ USER=$(dialog --clear --title "Manjaro ARM Installer" \
--inputbox "Enter the username you want: --inputbox "Enter the username you want:
(usernames must be all lowercase and first character may not be a number)" 10 75 \ (usernames must be all lowercase and first character may not be a number)" 10 90 \
3>&1 1>&2 2>&3 3>&-) 3>&1 1>&2 2>&3 3>&-)
if [[ "$USER" =~ [A-Z] ]] || [[ "$USER" =~ ^[0-9] ]] || [[ "$USER" == *['!'@#\$%^\&*()_+]* ]]; then if [[ "$USER" =~ [A-Z] ]] || [[ "$USER" =~ ^[0-9] ]] || [[ "$USER" == *['!'@#\$%^\&*()_+]* ]]; then
clear clear
@ -582,7 +580,7 @@ fi
if [ ! -z "$SDCARD" ]; then if [ ! -z "$SDCARD" ]; then
FSTYPE=$(dialog --clear --title "Manjaro ARM Installer" \ FSTYPE=$(dialog --clear --title "Manjaro ARM Installer" \
--menu "Choose a filesystem:" 10 75 10 \ --menu "Choose a filesystem:" 10 90 10 \
"ext4" "Regular ext4 filesystem" \ "ext4" "Regular ext4 filesystem" \
"btrfs" "Uses btrfs for root partition and makes / and /home subvolumes" \ "btrfs" "Uses btrfs for root partition and makes / and /home subvolumes" \
3>&1 1>&2 2>&3 3>&-) 3>&1 1>&2 2>&3 3>&-)
@ -594,7 +592,7 @@ 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 75 10 \ --menu "[Experimental!] Do you want encryption on root partition?" 10 90 10 \
"yes" "Yes, please" \ "yes" "Yes, please" \
"no" "No, thanks" \ "no" "No, thanks" \
3>&1 1>&2 2>&3 3>&-) 3>&1 1>&2 2>&3 3>&-)
@ -683,6 +681,7 @@ if [ ! -z "$HOSTNAME" ]; then
Device = $DEVICE Device = $DEVICE
Edition = $EDITION Edition = $EDITION
Username = $USER Username = $USER
Full Username = $FULLNAME
Additional usergroups = $USERGROUPS Additional usergroups = $USERGROUPS
Password for $USER = (password hidden) Password for $USER = (password hidden)
Password for root = (password hidden) Password for root = (password hidden)