| 1 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 2 |
--- |
| 3 |
targets/support/bootloader-setup.sh | 21 +++++++++++++++++++-- |
| 4 |
targets/support/functions.sh | 22 ---------------------- |
| 5 |
2 files changed, 19 insertions(+), 24 deletions(-) |
| 6 |
|
| 7 |
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh |
| 8 |
index d507fe5e..d3a6b2dc 100755 |
| 9 |
--- a/targets/support/bootloader-setup.sh |
| 10 |
+++ b/targets/support/bootloader-setup.sh |
| 11 |
@@ -19,8 +19,25 @@ else |
| 12 |
fi |
| 13 |
|
| 14 |
extract_kernels $1/boot |
| 15 |
-check_bootargs |
| 16 |
-check_filesystem_type |
| 17 |
+ |
| 18 |
+# Add any additional options |
| 19 |
+if [ -n "${clst_livecd_bootargs}" ] |
| 20 |
+then |
| 21 |
+ for x in ${clst_livecd_bootargs} |
| 22 |
+ do |
| 23 |
+ cmdline_opts="${cmdline_opts} ${x}" |
| 24 |
+ done |
| 25 |
+fi |
| 26 |
+ |
| 27 |
+case ${clst_fstype} in |
| 28 |
+ squashfs) |
| 29 |
+ cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs" |
| 30 |
+ ;; |
| 31 |
+ jffs2) |
| 32 |
+ cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2" |
| 33 |
+ ;; |
| 34 |
+esac |
| 35 |
+ |
| 36 |
|
| 37 |
default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot" |
| 38 |
[ -n "${clst_splash_theme}" ] && default_append_line="${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" |
| 39 |
diff --git a/targets/support/functions.sh b/targets/support/functions.sh |
| 40 |
index 601f5dc9..ac6710ad 100755 |
| 41 |
--- a/targets/support/functions.sh |
| 42 |
+++ b/targets/support/functions.sh |
| 43 |
@@ -216,25 +216,3 @@ extract_kernel() { |
| 44 |
mv ${1}/initramfs-* ${1}/${2}.igz |
| 45 |
fi |
| 46 |
} |
| 47 |
- |
| 48 |
-check_bootargs(){ |
| 49 |
- # Add any additional options |
| 50 |
- if [ -n "${clst_livecd_bootargs}" ] |
| 51 |
- then |
| 52 |
- for x in ${clst_livecd_bootargs} |
| 53 |
- do |
| 54 |
- cmdline_opts="${cmdline_opts} ${x}" |
| 55 |
- done |
| 56 |
- fi |
| 57 |
-} |
| 58 |
- |
| 59 |
-check_filesystem_type(){ |
| 60 |
- case ${clst_fstype} in |
| 61 |
- squashfs) |
| 62 |
- cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs" |
| 63 |
- ;; |
| 64 |
- jffs2) |
| 65 |
- cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2" |
| 66 |
- ;; |
| 67 |
- esac |
| 68 |
-} |
| 69 |
-- |
| 70 |
2.26.2 |
Archives