summaryrefslogtreecommitdiff
path: root/meta/packages/initrdscripts/files
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2008-11-10 18:50:56 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2008-11-10 18:50:56 +0100
commit2685507637ba11f25d1e35053d4663add2ad51ef (patch)
treefa30fc859fb444a7b1b18225dc752628ab2f9051 /meta/packages/initrdscripts/files
parentcf96c4ce6ca3901abebe7abefcee0a37ca8c5673 (diff)
downloadopenembedded-core-2685507637ba11f25d1e35053d4663add2ad51ef.tar.gz
openembedded-core-2685507637ba11f25d1e35053d4663add2ad51ef.tar.bz2
openembedded-core-2685507637ba11f25d1e35053d4663add2ad51ef.tar.xz
openembedded-core-2685507637ba11f25d1e35053d4663add2ad51ef.zip
initrdscripts: Fix the init scripts to support the no fb case.
Diffstat (limited to 'meta/packages/initrdscripts/files')
-rw-r--r--meta/packages/initrdscripts/files/init-install.sh2
-rw-r--r--meta/packages/initrdscripts/files/init-live.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/initrdscripts/files/init-install.sh b/meta/packages/initrdscripts/files/init-install.sh
index 4d90f457c..9ef6c47b8 100644
--- a/meta/packages/initrdscripts/files/init-install.sh
+++ b/meta/packages/initrdscripts/files/init-install.sh
@@ -139,7 +139,7 @@ echo "default 0" > /ssd/boot/grub/menu.lst
echo "timeout 30" >> /ssd/boot/grub/menu.lst
echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst
echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst
-echo "kernel /boot/vmlinuz root=$rootfs rw video=$3 vga=$4 quiet" >> /ssd/boot/grub/menu.lst
+echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
cp /media/$1/vmlinuz /ssd/boot/
diff --git a/meta/packages/initrdscripts/files/init-live.sh b/meta/packages/initrdscripts/files/init-live.sh
index 96a1a9488..d4e53713e 100644
--- a/meta/packages/initrdscripts/files/init-live.sh
+++ b/meta/packages/initrdscripts/files/init-live.sh
@@ -27,9 +27,9 @@ read_args() {
LABEL=*)
label=$optarg ;;
video=*)
- video_mode=$optarg ;;
+ video_mode=$arg ;;
vga=*)
- vga_mode=$optarg ;;
+ vga_mode=$arg ;;
esac
done
}
@@ -79,7 +79,7 @@ case $label in
;;
install)
if [ -f /media/$i/$ROOT_IMAGE ] ; then
- ./install.sh $i $ROOT_IMAGE $video_mode $vga
+ ./install.sh $i $ROOT_IMAGE $video_mode $vga_mode
else
fatal "Couldnt find install script"
fi