diff options
author | Dirk von Suchodoletz | 2010-08-22 16:03:18 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2010-08-22 16:03:18 +0200 |
commit | 30e9b185bc1e9dcc229f594f5f0c9e7c6424ac14 (patch) | |
tree | ab565e3270e5008ea31a99345d141fd5b089a5b3 /initramfs | |
parent | Adding missing files for splashy ... (diff) | |
download | core-30e9b185bc1e9dcc229f594f5f0c9e7c6424ac14.tar.gz core-30e9b185bc1e9dcc229f594f5f0c9e7c6424ac14.tar.xz core-30e9b185bc1e9dcc229f594f5f0c9e7c6424ac14.zip |
...
Diffstat (limited to 'initramfs')
-rwxr-xr-x | initramfs/stage3-stuff/bin/dhcpmkconfig | 3 | ||||
-rwxr-xr-x | initramfs/stage3-stuff/bin/hwautocfg | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/initramfs/stage3-stuff/bin/dhcpmkconfig b/initramfs/stage3-stuff/bin/dhcpmkconfig index b2b78496..fa01db75 100755 --- a/initramfs/stage3-stuff/bin/dhcpmkconfig +++ b/initramfs/stage3-stuff/bin/dhcpmkconfig @@ -14,6 +14,9 @@ # applet used within OpenSLX initramfs. The result is written to the # /etc/initramfs-setup file +# script started twice by udhcpc, quit fast if no ip configuration present +[ -z "$ip" ] && exit 0 + # heavy debugging output in level 3 and above ... and on 13 #FIXME: DEBUGLEVEL is not propagated to this file (at least for Ubuntu) [ -z "$DEBUGLEVEL" ] && DEBUGLEVEL=0 diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index 04e47e44..1f02892e 100755 --- a/initramfs/stage3-stuff/bin/hwautocfg +++ b/initramfs/stage3-stuff/bin/hwautocfg @@ -35,7 +35,7 @@ if strinfile "vga=" /proc/cmdline; then ( modprobe -a vesafb fbcon 2>/dev/null hwinfo --gfxcard >/etc/hwinfo.gfxcard ) & elif [ -e /etc/init-hooks/00-started/xserver.sh -o \ - -e /etc/init-hooks/05-started/bootsplash.sh ] && \ + -e /etc/init-hooks/05--have-kernelvars/bootsplash.sh ] && \ [ -e /lib/modules/${KERNEL}/kernel/drivers/gpu ]; then # check for the standard modules (single gpu, multiple connector only) ( hwinfo --gfxcard >/etc/hwinfo.gfxcard |