X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F40install_driver_updates;h=762a084c9e02a5e41a9119c38a91dc03dd987758;hb=97408b11af6a34e86848212f14282e60ba5195f8;hp=5822f8f8245e3cf57e3a1dafc36174283f0fbb27;hpb=9fc9e2a1a11b0edada38cb501fefe4f58aa414ac;p=live-boot-grml.git

diff --git a/scripts/live-bottom/40install_driver_updates b/scripts/live-bottom/40install_driver_updates
index 5822f8f..762a084 100755
--- a/scripts/live-bottom/40install_driver_updates
+++ b/scripts/live-bottom/40install_driver_updates
@@ -1,28 +1,35 @@
-#! /bin/sh
+#!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Installing driver updates..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-if [ ! -d /tmp/driver-updates ]; then
+# live-initramfs header
+
+. /scripts/live-functions
+
+# live-initramfs script
+
+if [ ! -d /tmp/driver-updates ]
+then
 	exit 0
 fi
 
-log_begin_msg "$DESCRIPTION"
+log_begin_msg "Installing driver updates..."
 
 install_dir=/var/cache/driver-updates
 
@@ -30,10 +37,16 @@ mkdir "/root$install_dir"
 cp -a /tmp/driver-updates/*.deb "/root$install_dir/"
 
 # We cannot leave packages in a bad state. So if the install fails, remove
-# it. This will get caught in casper.log.
-for deb in "/root$install_dir"/*; do
-	if ! chroot /root dpkg -i "$install_dir/$deb"; then
-		chroot /root dpkg -P "${deb%%_*}"
+# it. This will get caught in live.log.
+for deb in "/root$install_dir"/*
+do
+	[ -f "$deb" ] || continue
+
+	debbase="${deb##*/}"
+
+	if ! chroot /root dpkg -i "$install_dir/$debbase"
+	then
+		chroot /root dpkg -P "${debbase%%_*}"
 	fi
 done