X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F40install_driver_updates;h=584dcd0244fec94d1a63ba54981ace536352d9c5;hb=c9df233f3f817379e27d860738abafdee3463526;hp=66ae12333cd958b297399ee68047d7251ffac921;hpb=25bcd436af6202932ad494c8ddd0a49999579924;p=live-boot-grml.git

diff --git a/scripts/live-bottom/40install_driver_updates b/scripts/live-bottom/40install_driver_updates
index 66ae123..584dcd0 100755
--- a/scripts/live-bottom/40install_driver_updates
+++ b/scripts/live-bottom/40install_driver_updates
@@ -22,24 +22,31 @@ esac
 
 . /scripts/live-functions
 
-log_begin_msg "Installing driver updates..."
-
 # live-initramfs script
 
-if [ ! -d /tmp/driver-updates ]; then
+if [ ! -d /tmp/driver-updates ]
+then
 	exit 0
 fi
 
+log_begin_msg "Installing driver updates..."
+
 install_dir=/var/cache/driver-updates
 
-mkdir "/root$install_dir"
-cp -a /tmp/driver-updates/*.deb "/root$install_dir/"
+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 live.log.
-for deb in "/root$install_dir"/*; do
-	if ! chroot /root dpkg -i "$install_dir/$deb"; then
-		chroot /root dpkg -P "${deb%%_*}"
+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