--- trunk/installer-simple/bin/installer.sh.in 2014/01/08 12:27:04 2493 +++ trunk/installer-simple/bin/installer.sh.in 2014/01/08 13:20:29 2500 @@ -107,7 +107,7 @@ then echo $"${INSTALLROOT} already mounted" >&2 else - mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive'${ROOTHDD}' -> '${INSTALLROOT}'" + mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'" fi [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot } @@ -310,18 +310,13 @@ addconfig 'NETWORKING="dhcp"' # intel framebuffer quirk - if [ -e ${INSTALLROOT}/etc/splash/splash.conf ] + CONFIG="${INSTALLROOT}/etc/splash/splash.conf" + if [ -e ${CONFIG} ] && [ -e /proc/fb ] then - if [ -e /proc/fb ] + if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]] then - if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]] - then - fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:') - if [[ ${fbdev} != 0 ]] - then - sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die - fi - fi + fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:') + [[ ${fbdev} != 0 ]] && sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${CONFIG} || dialog_die fi fi }