[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     c21f53e42bf007ad074b0c6b23bfd85564832d46
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 13:26:08 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> 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 <bkohler <AT> 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
 
                ;;