]> cvs.zerfleddert.de Git - m1-debian/commitdiff
manual merge
authorThomas Glanzmann <thomas@glanzmann.de>
Sat, 22 Jan 2022 21:44:20 +0000 (22:44 +0100)
committerThomas Glanzmann <thomas@glanzmann.de>
Sat, 22 Jan 2022 21:44:20 +0000 (22:44 +0100)
1  2 
README

diff --cc README
index 8f4e23fda4e25e5989fb46b5784202b3349156e4,b1a4cf4afc332c867212512c89a17e3f614f0479..86e81cedb78b436437f4ddff3aec9164463cd89b
--- 1/README
--- 2/README
+++ b/README
@@@ -22,7 -24,4 +24,9 @@@ ln -s lib/systemd/systemd ini
  
  find . | cpio --quiet -H newc -o | pigz > /boot/initrd.gz
  
+ > etc/motd
++
 +cp /boot/efi/EFI/BOOT/BOOTAA64.EFI efi/boot/
 +cp /boot/vmlinuz-5.16.0-asahi-next-20220118-14779-ga4d177b3ad21-dirty vmlinuz
 +
 +./scripts/kconfig/merge_config.sh .config .config-fragment
Impressum, Datenschutz