projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjusting to live-initramfs.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
40install_driver_updates
diff --git
a/scripts/live-bottom/40install_driver_updates
b/scripts/live-bottom/40install_driver_updates
index
d6f149a
..
584dcd0
100755
(executable)
--- a/
scripts/live-bottom/40install_driver_updates
+++ b/
scripts/live-bottom/40install_driver_updates
@@
-22,26
+22,31
@@
esac
. /scripts/live-functions
. /scripts/live-functions
-log_begin_msg "Installing driver updates..."
-
# live-initramfs script
# live-initramfs script
-if [ ! -d /tmp/driver-updates ]; then
+if [ ! -d /tmp/driver-updates ]
+then
exit 0
fi
exit 0
fi
+log_begin_msg "Installing driver updates..."
+
install_dir=/var/cache/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.
# 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
- [ -f "$deb" ] || continue
+for deb in "/root${install_dir}"/*
+do
+ [ -f "${deb}" ] || continue
+
debbase="${deb##*/}"
debbase="${deb##*/}"
- if ! chroot /root dpkg -i "$install_dir/$debbase"; then
- chroot /root dpkg -P "${debbase%%_*}"
+
+ if ! chroot /root dpkg -i "${install_dir}/${debbase}"
+ then
+ chroot /root dpkg -P "${debbase%%_*}"
fi
done
fi
done