Line in the wrong section spotted by Jostein Kjønigsen

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 393692a1d0dfaf5e96e09d9257f7f61965693c3f..b7232795e0fbacb2333196c140a7fd3ec2aadaa3 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -19,7 +19,7 @@ build_rootfs()
 (
         sudo rm -rf testing
         mkdir -p cache
 (
         sudo rm -rf testing
         mkdir -p cache

-        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk,cryptsetup,wireless-regdb testing testing http://deb.debian.org/debian
+        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk,cryptsetup,wireless-regdb,zstd stable testing http://deb.debian.org/debian

 
         cd testing
 
 
         cd testing
 


@@ -99,7 +99,7 @@ build_efi()
         export UUID=`blkid -s UUID -o value media`
         cat > EFI/debian/grub.cfg <<EOF
 search.fs_uuid ${UUID} root
         export UUID=`blkid -s UUID -o value media`
         cat > EFI/debian/grub.cfg <<EOF
 search.fs_uuid ${UUID} root

-linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw
+linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw net.ifnames=0

 initrd (\$root)/boot/${INITRD}
 boot
 EOF
 initrd (\$root)/boot/${INITRD}
 boot
 EOF


@@ -127,8 +127,6 @@ publish_artefacts()
 mkdir -p build
 cd build
 
 mkdir -p build
 cd build
 

-sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves zstd
-

 build_rootfs
 build_dd
 build_efi
 build_rootfs
 build_dd
 build_efi