Merge lp:~superm1/hw-detect/dell-driver-injection-disk into lp:~ubuntu-core-dev/hw-detect/ubuntu

[Mario Limonciello]

[lp:~superm1/hw-detect/dell-driver-injection-disk]

113. By Mario Limonciello on 2009-06-23

revert r110 since we are not changing the syntax for mountmedia to use the firmware keyword

114. By Mario Limonciello on 2009-06-23

pull in the safe shell code from localechooser to find out where we are storing our driver disks at

115. By Mario Limonciello on 2009-06-23

merge with main ~ubuntu-core-dev/hw-detect/ubuntu branch

=== modified file 'Makefile'
--- Makefile	2008-11-04 23:42:42 +0000
+++ Makefile	2009-03-12 04:59:31 +0000
@@ -32,7 +32,7 @@
 	rm -f *.o
 	rm -f archdetect
 
-install: install-hw-detect install-ethdetect install-disk-detect install-archdetect install-archdetect-deb
+install: install-hw-detect install-ethdetect install-disk-detect install-driver-injection-disk-detect install-archdetect install-archdetect-deb
 
 install-hw-detect: hw-detect.sh
 	$(INSTALL) -d $(bindir)
@@ -72,6 +72,10 @@
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) disk-detect.sh $(bindir)/disk-detect
 
+install-driver-injection-disk-detect: driver-injection-disk.sh
+	$(INSTALL) -d $(bindir)
+	$(INSTALL) driver-injection-disk.sh $(bindir)/driver-injection-disk
+
 install-archdetect: archdetect
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) archdetect $(bindir)
 
=== modified file 'check-missing-firmware.sh'
--- check-missing-firmware.sh	2008-09-14 20:14:32 +0000
+++ check-missing-firmware.sh	2009-03-12 04:58:25 +0000
@@ -111,7 +111,7 @@
 	# Try to load udebs (or debs) that contain the missing firmware.
 	# This does not use anna because debs can have arbitrary
 	# dependencies, which anna might try to install.
-	if mountmedia driver; then
+	if mountmedia firmware; then
 		echo "$files" | sed -e 's/ /\n/g' >/tmp/grepfor
 		for filename in /media/*.deb /media/*.udeb /media/*.ude /media/firmware/*.deb /media/firmware/*.udeb /media/firmware/*.ude; do
 			if [ -f "$filename" ]; then
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-03-04 16:33:01 +0000
+++ debian/changelog	2009-03-12 05:00:21 +0000
@@ -1,3 +1,11 @@
+hw-detect (1.71ubuntu6) UNRELEASED; urgency=low
+
+  * Add support for Dell Driver Injection disk v1, an integrated flash media based 
+    solution for adding in drivers after OS launches.  This feature will be on 
+    upcoming Dell servers. (LP: #341526)
+
+ -- Mario Limonciello <[e-mail]>  Wed, 11 Mar 2009 13:26:55 -0500
+
 hw-detect (1.71ubuntu5) jaunty; urgency=low
 
   * Use 'update-dev --settle' rather than 'update-dev' after loading modules
 
=== modified file 'debian/control'
--- debian/control	2009-03-02 14:13:00 +0000
+++ debian/control	2009-03-12 04:59:31 +0000
@@ -33,6 +33,15 @@
 XB-Installer-Menu-Item: 3500
 Description: Detect disk drives
 
+Package: driver-injection-disk-detect
+XC-Package-Type: udeb
+Architecture: all
+Depends: hw-detect, mountmedia
+Priority: optional
+Enhances: hw-detect
+XB-Installer-Menu-Item: 1500
+Description: Detect OEM driver injection disks
+
 Package: archdetect
 XC-Package-Type: udeb
 Architecture: any
 
=== added file 'debian/driver-injection-disk-detect.postinst'
--- debian/driver-injection-disk-detect.postinst	1970-01-01 00:00:00 +0000
+++ debian/driver-injection-disk-detect.postinst	2009-03-12 04:59:31 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+driver-injection-disk
 
=== added file 'debian/driver-injection-disk-detect.templates'
--- debian/driver-injection-disk-detect.templates	1970-01-01 00:00:00 +0000
+++ debian/driver-injection-disk-detect.templates	2009-03-12 04:59:31 +0000
@@ -0,0 +1,13 @@
+Template: debian-installer/driver-injection-disk-detect/title
+Type: text
+#  Main menu item
+# :sl1:
+_Description: Detect OEM driver injection disks
+
+Template: driver-injection-disk/load
+Type: boolean
+# :sl2:
+_Description: Load OEM supported drivers from driver injection disk?
+ Your OEM has prepared internal media that contains the drivers you may
+ need for supporting this hardware with this OS release.
+
 
=== added file 'driver-injection-disk.sh'
--- driver-injection-disk.sh	1970-01-01 00:00:00 +0000
+++ driver-injection-disk.sh	2009-03-12 04:59:31 +0000
@@ -0,0 +1,48 @@
+#!/bin/sh
+set -e
+. /usr/share/debconf/confmodule
+
+log () {
+	logger -t driver-injection-disk "$@"
+}
+
+check_deb_arch () {
+	arch=$(ar p "$1" control.tar.gz | tar zxO ./control | grep '^Architecture:' | sed -e 's/Architecture: *//')
+	[ "$arch" = all ] || [ "$arch" = "$(udpkg --print-architecture)" ]
+}
+
+install_driver_pkg () {
+	if echo "$1" | grep -q '\.deb$'; then
+		# cache deb for installation into /target later
+		mkdir -p /var/cache/firmware/
+		cp -a "$1" /var/cache/firmware/ || true
+		udpkg --unpack "/var/cache/firmware/$(basename "$1")"
+	else
+		udpkg --unpack "$1"
+	fi
+}
+
+#try to mount possible driver disk
+for device in $(list-devices usb-partition); do
+	label=$(/sbin/vol_id --label $device 2>/dev/null || true)
+	if [ "$label" = "OEMDRV" ]; then
+		db_input high driver-injection-disk/load || true
+		if ! db_go; then
+			exit 10 # back up
+		fi
+		db_get driver-injection-disk/load
+		if [ "$RET" = true ]; then
+			if mountmedia driver-injection-disk; then
+				dir=/media/ubuntu/$(grep DISTRIB_RELEASE /etc/lsb-release | cut -d"=" -f2)
+				for filename in $dir/*.deb $dir/*.udeb $dir/*.ude; do
+					if [ -f "$filename" ] && check_deb_arch "$filename"; then
+						log "installing driver package $filename"
+						install_driver_pkg "$filename" || true
+					fi
+				done
+			fi
+			umount /media || true
+		fi
+	fi
+done
+