From 3d04360ea9c328d3399f824a9a957977e9057d75 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 9 Apr 2021 11:09:02 +0000 Subject: [PATCH] Remove unnecessary boot.cmd edit step --- scripts/armbian_rootenc_setup.sh | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/scripts/armbian_rootenc_setup.sh b/scripts/armbian_rootenc_setup.sh index d54d1f4..12f3b73 100755 --- a/scripts/armbian_rootenc_setup.sh +++ b/scripts/armbian_rootenc_setup.sh @@ -887,17 +887,6 @@ bootlogo=false" _display_file $file } -edit_boot_cmd() { - local file="$TARGET_ROOT/boot/boot.cmd" - ed $file <<-'EOF' - g/^\s*setenv rootdev/d - g/^\s*setenv console/d - g/^\s*setenv bootlogo/d - wq - EOF - _display_file $file -} - # Add the following lines to '/etc/initramfs-tools/initramfs.conf'. If # your board’s IP address will be statically configured, substitute the # correct static IP address after 'IP='. If it will be configured via @@ -995,13 +984,6 @@ exit 0' # begin chroot functions: -make_image() { - local cmd text - cmd="mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr" - local text=$($cmd) - _display_file "$cmd" "$text" -} - apt_install_target() { local pkgs=$(_print_pkgs_to_install 'target') [ "$pkgs" ] && { @@ -1068,7 +1050,6 @@ configure_target() { _set_target_vars copy_etc_files copy_etc_files_distro_specific - edit_boot_cmd edit_initramfs_conf edit_initramfs_modules [ "$IP_ADDRESS" == 'none' ] || copy_authorized_keys @@ -1149,7 +1130,6 @@ if [ "$ARG1" == 'in_target' ]; then SCRIPT_DESC='Target script' set -e _hide_output - make_image [ "$target_distro" == 'bionic' ] && { echo 'export CRYPTSETUP=y' > '/etc/initramfs-tools/conf.d/cryptsetup' }