Optimized chroot

This commit is contained in:
Kevin Veen-Birkenbach 2020-05-21 19:42:29 +02:00
parent 49f5bddbea
commit 16d16387f2
3 changed files with 19 additions and 7 deletions

View File

@ -98,6 +98,7 @@ To pase the configuration to the program use this syntax:
echo "n" # | Should the ssh-key be copied to the image?(y/N) echo "n" # | Should the ssh-key be copied to the image?(y/N)
echo "n" # |Should the hostname be changed?(y/N) echo "n" # |Should the hostname be changed?(y/N)
#echo "example-host" # | The hostname #echo "example-host" # | The hostname
echo "y" # Should the image system be updated?(y/N)
#echo "y" # | Setup Wifi on target system - Not implemented yet #echo "y" # | Setup Wifi on target system - Not implemented yet
)| sudo bash ./scripts/image/setup.sh | tee log.txt )| sudo bash ./scripts/image/setup.sh | tee log.txt
``` ```

View File

@ -4,6 +4,12 @@
# shellcheck disable=SC2154 # Deactivate not referenced link # shellcheck disable=SC2154 # Deactivate not referenced link
source "$(dirname "$(readlink -f "${0}")")/base.sh" || (echo "Loading base.sh failed." && exit 1) source "$(dirname "$(readlink -f "${0}")")/base.sh" || (echo "Loading base.sh failed." && exit 1)
destructor(){
info "Unmount everything" &&
umount "$root_mount_path"/{dev/pts,dev,sys,proc,boot,} $boot_mount_path||
warning "Failed."
}
info "Starting chroot..." info "Starting chroot..."
set_device_path set_device_path
@ -26,6 +32,4 @@ info "Bash shell starts..." &&
chroot "$root_mount_path" /bin/bash || chroot "$root_mount_path" /bin/bash ||
error error
info "unmount everything" && destructor
umount "$root_mount_path"/{dev/pts,dev,sys,proc,boot,} ||
error

View File

@ -349,10 +349,7 @@ if [ "$change_password" == "y" ]
else else
info "Skipped password change..." info "Skipped password change..."
fi fi
# @todo add to chroot
#pacman-key --init
#pacman-key --populate archlinuxarm
#pacman -Syyu
question "Should the hostname be changed?(y/N)" && read -r change_hostname question "Should the hostname be changed?(y/N)" && read -r change_hostname
if [ "$change_hostname" == "y" ] if [ "$change_hostname" == "y" ]
then then
@ -361,6 +358,16 @@ if [ "$change_hostname" == "y" ]
else else
info "Skipped hostname change..." info "Skipped hostname change..."
fi fi
question "Should the image system be updated?(y/N)" && read -r update_system
if [ "$update_system" == "y" ]
then
(
echo "yes | pacman-key --init"
echo "yes | pacman-key --populate archlinuxarm"
echo "yes | pacman -Syyu"
) | chroot "$root_mount_path" /bin/bash || error "Password change failed."
fi
# question "Do you want to copy all Wifi passwords to the device?(y/n)" && read -r copy_wifi # question "Do you want to copy all Wifi passwords to the device?(y/n)" && read -r copy_wifi
# if [ "$copy_wifi" = "y" ] # if [ "$copy_wifi" = "y" ]
# then # then