diff options
| author | Jonathan Bauer | 2013-03-13 17:33:57 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2013-03-13 17:33:57 +0100 |
| commit | 1efcd9ce0605ed8694f621b9889843ceca673b10 (patch) | |
| tree | 92890797e88f3f4e7153811f800b3acf87aa62be /remote/core | |
| parent | stage3.1 'debug' to drop a shell (diff) | |
| download | tm-scripts-1efcd9ce0605ed8694f621b9889843ceca673b10.tar.gz tm-scripts-1efcd9ce0605ed8694f621b9889843ceca673b10.tar.xz tm-scripts-1efcd9ce0605ed8694f621b9889843ceca673b10.zip | |
plymouth for stage3.1
Diffstat (limited to 'remote/core')
| -rw-r--r-- | remote/core/core.conf | 2 | ||||
| -rwxr-xr-x | remote/core/data/init | 22 |
2 files changed, 19 insertions, 5 deletions
diff --git a/remote/core/core.conf b/remote/core/core.conf index 40f6aedb..3298bfee 100644 --- a/remote/core/core.conf +++ b/remote/core/core.conf @@ -1,5 +1,6 @@ REQUIRED_MODULES=" kernel/drivers/video/sis/sisfb.ko kernel/drivers/video/via/viafb.ko + kernel/drivers/video/uvesafb.ko kernel/drivers/acpi/video.ko kernel/drivers/ssb/ssb.ko kernel/drivers/gpu/drm/ttm/ttm.ko @@ -17,6 +18,7 @@ REQUIRED_MODULES=" kernel/drivers/video/sis/sisfb.ko kernel/drivers/gpu/drm/mga/mga.ko kernel/drivers/gpu/drm/i915/i915.ko kernel/drivers/gpu/drm/r128/r128.ko + kernel/drivers/gpu/drm/vmwgfx/vmwgfx.ko kernel/drivers/i2c/algos/i2c-algo-bit.ko kernel/drivers/net/netconsole.ko kernel/drivers/net/ethernet/realtek/8139too.ko diff --git a/remote/core/data/init b/remote/core/data/init index 54044938..25508e66 100755 --- a/remote/core/data/init +++ b/remote/core/data/init @@ -34,6 +34,8 @@ for opts in ${KCL}; do case ${opts} in debug*) DEBUG=1;; + splash*) + SPLASH=1;; ip=*) # process IP info ipinfo=${opts#ip=};; @@ -47,13 +49,16 @@ done while ps | grep -v grep | grep -q " hwinfo --gfxcard" ; do usleep 10 ; done +# always load framebuffer +modprobe uvesafb mode_option=1024x768-32 mtrr=3 scroll=ywrap + case $(cat /etc/hwinfo) in *i915*) modprobe -a i915 2>/dev/null ;; *intel*|*Intel*) modprobe -a i810 i830 i915 2>/dev/null - ;; + ;; *nvidia*|*NVidia*|*nouveau*) modprobe -q nouveau 2>/dev/null ;; @@ -63,13 +68,19 @@ case $(cat /etc/hwinfo) in *mga*|*matrox*|*Matrox*) modprobe -q mga 2>/dev/null ;; - *VMWARE*) - ;; - *) + *VMWARE*) + modprove -q vmwgfx 2>/dev/null + ;; + *) modprobe -qa r128 savage sis tdfx ttm via viafb ;; esac -( modprobe -a drm fbcon; mdev -s ) & +(modprobe -a drm; mdev -s ) & + +if [ "x$SPLASH" == "x1" ]; then + # start plymouth + plymouthd && plymouth show-splash +fi # load required network and usb controller drivers, filter out wireless adaptors while ps | grep -v grep | grep -q " hwinfo --netcard" ; do usleep 10 ; done @@ -149,5 +160,6 @@ for mnt in proc sys run ; do done unset BOOT_IMAGE initrd +[ "x$SPLASH" = "x1" ] && plymouth update-root-fs --new-root-dir=/mnt # new style of pivoting (switch_root or run-init) exec /sbin/switch_root -c /dev/console /mnt /usr/lib/systemd/systemd |