diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2009-04-10 15:55:42 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2009-04-10 15:55:42 -0700 |
| commit | b9c92a3bb82e860c8368eb7933f5ec4ddcd74bcb (patch) | |
| tree | d9486a725aef476a595156067aa5c0c9ce9b28ad /scripts/init-top | |
| parent | 3939e96a8830755228bd2bbedb50db6808d36f80 (diff) | |
| download | initramfs-tools-b9c92a3bb82e860c8368eb7933f5ec4ddcd74bcb.tar.gz initramfs-tools-b9c92a3bb82e860c8368eb7933f5ec4ddcd74bcb.zip | |
merge 0.92o from git://git.debian.org/git/kernel/initramfs-tools.git
Diffstat (limited to 'scripts/init-top')
| -rwxr-xr-x | scripts/init-top/all_generic_ide | 5 | ||||
| -rwxr-xr-x | scripts/init-top/framebuffer | 17 |
2 files changed, 21 insertions, 1 deletions
diff --git a/scripts/init-top/all_generic_ide b/scripts/init-top/all_generic_ide index 28b519a..3274ee8 100755 --- a/scripts/init-top/all_generic_ide +++ b/scripts/init-top/all_generic_ide @@ -18,5 +18,10 @@ for x in $(cat /proc/cmdline); do all_generic_ide) modprobe ide-generic ;; + all_generic_ide=*) + if [ ${x#all_generic_ide=} ]; then + modprobe ide-generic + fi + ;; esac done diff --git a/scripts/init-top/framebuffer b/scripts/init-top/framebuffer index 21a6b19..0ed798e 100755 --- a/scripts/init-top/framebuffer +++ b/scripts/init-top/framebuffer @@ -72,11 +72,16 @@ for x in $(cat /proc/cmdline); do esac done -# Map command line name to module name +# Map command line name to module name and other tweaks case ${FB} in matroxfb) FB=matroxfb_base ;; +uvesafb) + # v86d requires /dev/zero and dev/mem, but udev haven't been started yet + [ -e /dev/zero ] || mknod -m 0666 /dev/zero c 1 5 + [ -e /dev/mem ] || mknod -m 0640 /dev/mem c 1 1 + ;; *) ;; esac @@ -85,3 +90,13 @@ if [ -n "${FB}" ]; then modprobe fbcon modprobe ${FB} ${OPTS} fi + +if [ -e /proc/fb ]; then + while read fbno desc; do + if [ $(($fbno < 32)) ]; then + mknod -m 0640 /dev/fb${fbno} c 29 ${fbno} + fi + done < /proc/fb +else + mknod -m 0640 /dev/fb0 c 29 0 +fi |