From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5539F138350 for ; Thu, 9 Apr 2020 18:48:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 575C1E0940; Thu, 9 Apr 2020 18:48:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F4F5E0928 for ; Thu, 9 Apr 2020 18:48:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16A8C34EF3C for ; Thu, 9 Apr 2020 18:48:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA1D01C8 for ; Thu, 9 Apr 2020 18:48:00 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586458043.23148d3c59f625d0d5135f80d57dfc70ec67b854.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 23148d3c59f625d0d5135f80d57dfc70ec67b854 X-VCS-Branch: master Date: Thu, 9 Apr 2020 18:48:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2dd7bb77-2f70-4982-99e7-5c6384373cd4 X-Archives-Hash: 895750ea700b8fffb4a9e26a32b87e82 commit: 23148d3c59f625d0d5135f80d57dfc70ec67b854 Author: Matt Turner gentoo org> AuthorDate: Wed Apr 8 07:10:49 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Apr 9 18:47:23 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=23148d3c targets: Use heredocs Signed-off-by: Matt Turner gentoo.org> targets/support/livecdfs-update.sh | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 1630a8f0..d0a76a92 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -74,31 +74,37 @@ done # Add this for hwsetup/mkx86config mkdir -p /etc/sysconfig -echo "####################################################" > /etc/fstab -echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD ##" >> /etc/fstab -echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab -echo "####################################################" >> /etc/fstab +cat < /etc/fstab +#################################################### +## ATTENTION: THIS IS THE FSTAB ON THE LIVECD ## +## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ## +#################################################### # fstab tweaks -echo "tmpfs / tmpfs defaults 0 0" >> /etc/fstab +tmpfs / tmpfs defaults 0 0 +EOF mv ${clst_make_conf} ${clst_make_conf}.old -echo "####################################################" >> ${clst_make_conf} -echo "## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##" >> ${clst_make_conf} -echo "## PLEASE EDIT /mnt/gentoo${clst_make_conf} INSTEAD ##" >> ${clst_make_conf} -echo "####################################################" >> ${clst_make_conf} +cat < ${clst_make_conf} +#################################################### +## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ## +## PLEASE EDIT /mnt/gentoo${clst_make_conf} INSTEAD ## +#################################################### +EOF cat ${clst_make_conf}.old >> ${clst_make_conf} # devfs tweaks [ -e /etc/devfsd.conf ] && ${clst_sed} -i '/dev-state/ s:^:#:' /etc/devfsd.conf # Add some helpful aliases -echo "alias cp='cp -i'" >> /etc/profile -echo "alias mv='mv -i'" >> /etc/profile -echo "alias rm='rm -i'" >> /etc/profile -echo "alias ls='ls --color=auto'" >> /etc/profile -echo "alias ll='ls -l'" >> /etc/profile -echo "alias grep='grep --color=auto'" >> /etc/profile +cat < /etc/profile +alias cp='cp -i' +alias mv='mv -i' +alias rm='rm -i' +alias ls='ls --color=auto' +alias ll='ls -l' +alias grep='grep --color=auto' +EOF # Make sure we have the latest pci,usb and hotplug ids. Older versions of # pciutils and usbutils used /sbin, where newer versions use /usr/sbin.