From 72ad84dfbc2593a5c143df6a3976ac5359167483 Mon Sep 17 00:00:00 2001 From: David P Date: Wed, 19 Aug 2020 17:14:30 -0400 Subject: sync with archiso, add timeout for i686 syslinux menus imported the following changes: 13b8c7d (HEAD -> master, origin/master, origin/HEAD) archiso/mkarchiso: correct the path of airootfs/etc/machine-id 41d3d7d Add Joliet file system to the ISO e6455b8 archiso/mkarchiso: create an empty /etc/machine-id ba3e834 scripts/run_archiso.sh: support booting the image as a hard disk or an optical disc 55d9d1f scripts/run_archiso.sh: disable PXE ROM 1e0ffd0 scripts/run_archiso.sh: don't duplicate qemu commands for each boot mode e9f209e Deprecate build.sh scripts and old mkarchiso commands 31b1dfd archiso/mkarchiso: delete all files in /boot not just the kernel and initramfs 7c2247f archiso/mkarchiso: allow choosing boot modes from profiledef.sh 41b9b89 archiso/mkarchiso: copy make_* functions from configs/releng/build.sh 1cc7375 archiso/mkarchiso: start preparing a build_profile command 0387b25 archiso/mkarchiso: general bash improvements --- configs/talkingparabola/airootfs/root/customize_airootfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/talkingparabola/airootfs') diff --git a/configs/talkingparabola/airootfs/root/customize_airootfs.sh b/configs/talkingparabola/airootfs/root/customize_airootfs.sh index c72644a..92e57de 100755 --- a/configs/talkingparabola/airootfs/root/customize_airootfs.sh +++ b/configs/talkingparabola/airootfs/root/customize_airootfs.sh @@ -4,7 +4,7 @@ set -e -u -echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.' +# Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version. sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen locale-gen -- cgit v1.2.2