commit: 8690b6f5a0afffc56fbe46b6c29a91d8ba91578d Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri May 1 06:46:52 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun May 3 22:55:53 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8690b6f5
targets: Inline functions with one caller Inline check_bootargs and check_filesystem_type since they have only one caller (in a different file). Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> targets/support/bootloader-setup.sh | 21 +++++++++++++++++++-- targets/support/functions.sh | 22 ---------------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index d507fe5e..d3a6b2dc 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -19,8 +19,25 @@ else fi extract_kernels $1/boot -check_bootargs -check_filesystem_type + +# Add any additional options +if [ -n "${clst_livecd_bootargs}" ] +then + for x in ${clst_livecd_bootargs} + do + cmdline_opts="${cmdline_opts} ${x}" + done +fi + +case ${clst_fstype} in + squashfs) + cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs" + ;; + jffs2) + cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2" + ;; +esac + default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot" [ -n "${clst_splash_theme}" ] && default_append_line="${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 601f5dc9..ac6710ad 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -216,25 +216,3 @@ extract_kernel() { mv ${1}/initramfs-* ${1}/${2}.igz fi } - -check_bootargs(){ - # Add any additional options - if [ -n "${clst_livecd_bootargs}" ] - then - for x in ${clst_livecd_bootargs} - do - cmdline_opts="${cmdline_opts} ${x}" - done - fi -} - -check_filesystem_type(){ - case ${clst_fstype} in - squashfs) - cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs" - ;; - jffs2) - cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2" - ;; - esac -}