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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EB3A815802F for ; Fri, 31 Mar 2023 13:28:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D9D3E0825; Fri, 31 Mar 2023 13:28:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 14B5AE0825 for ; Fri, 31 Mar 2023 13:28:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3180F340FC5 for ; Fri, 31 Mar 2023 13:28:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF20AA19 for ; Fri, 31 Mar 2023 13:28:47 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1680269258.c21f53e42bf007ad074b0c6b23bfd85564832d46.bkohler@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/bootloader-setup.sh targets/support/netboot-final.sh X-VCS-Directories: targets/support/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: c21f53e42bf007ad074b0c6b23bfd85564832d46 X-VCS-Branch: master Date: Fri, 31 Mar 2023 13:28:47 +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: d3befbc9-5094-43c4-ba0f-6bcb51efc106 X-Archives-Hash: 777205501c48ddf39e765b56c18c7c15 commit: c21f53e42bf007ad074b0c6b23bfd85564832d46 Author: Ben Kohler gentoo org> AuthorDate: Fri Mar 31 13:26:08 2023 +0000 Commit: Ben Kohler gentoo org> CommitDate: Fri Mar 31 13:27:38 2023 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c21f53e4 remove obsolete root=/dev/ram0 init=/linuxrc from a few more places Signed-off-by: Ben Kohler gentoo.org> targets/support/bootloader-setup.sh | 8 ++++---- targets/support/netboot-final.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 32d86028..d6d5f96e 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -64,8 +64,8 @@ case ${clst_hostarch} in for x in ${clst_boot_kernel} do echo -n "${bctr}:/boot/${x} " >> ${acfg} - echo -n "initrd=/boot/${x}.igz root=/dev/ram0 " >> ${acfg} - echo "init=/linuxrc ${cmdline_opts[@]} cdroot" >> ${acfg} + echo -n "initrd=/boot/${x}.igz " >> ${acfg} + echo "${cmdline_opts[@]} cdroot" >> ${acfg} ((bctr=${bctr}+1)) done # Pass 2 is for serial @@ -73,8 +73,8 @@ case ${clst_hostarch} in for x in ${clst_boot_kernel} do echo -n "${bctr}:/boot/${x} " >> ${acfg} - echo -n "initrd=/boot/${x}.igz root=/dev/ram0 " >> ${acfg} - echo "init=/linuxrc ${cmdline_opts[@]} cdroot" >> ${acfg} + echo -n "initrd=/boot/${x}.igz " >> ${acfg} + echo "${cmdline_opts[@]} cdroot" >> ${acfg} ((bctr=${bctr}+1)) done ;; diff --git a/targets/support/netboot-final.sh b/targets/support/netboot-final.sh index 7a26e0f4..fc0de880 100755 --- a/targets/support/netboot-final.sh +++ b/targets/support/netboot-final.sh @@ -31,7 +31,7 @@ case ${clst_hostarch} in -s ${clst_target_path}/${kname}-hppa.lif \ -f /dev/null \ -b /usr/share/palo/iplboot \ - -c "0/vmlinux initrd=0/ramdisk root=/dev/ram0" \ + -c "0/vmlinux initrd=0/ramdisk" \ || exit 1 ;;