diff -u open-iscsi-2.0.871/debian/changelog open-iscsi-2.0.871/debian/changelog
--- open-iscsi-2.0.871/debian/changelog
+++ open-iscsi-2.0.871/debian/changelog
@@ -1,3 +1,12 @@
+open-iscsi (2.0.871-0ubuntu9.1~ppa2) precise; urgency=low
+
+  * update resolvconf with settings found by ipconfig for the
+    interface that contains the iscsi-root filesystem (LP: #1050487)
+  * support files written by klibc ipconfig to be found in /tmp or
+    /run. copy files in /tmp to /run (LP: #1047722)
+
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 17 Sep 2012 16:44:24 -0400
+
 open-iscsi (2.0.871-0ubuntu9) oneiric-proposed; urgency=low
 
   * Make sure the upstart job triggers ifupdown's upstart script to avoid
diff -u open-iscsi-2.0.871/debian/open-iscsi.iscsi-network-interface.upstart open-iscsi-2.0.871/debian/open-iscsi.iscsi-network-interface.upstart
--- open-iscsi-2.0.871/debian/open-iscsi.iscsi-network-interface.upstart
+++ open-iscsi-2.0.871/debian/open-iscsi.iscsi-network-interface.upstart
@@ -16,19 +16,41 @@
 
 pre-start script
-    if iface="$(cat /run/initramfs/open-iscsi.interface)" && [ "$iface" ] && \
+    CR="
+"
+    ifile=/run/initramfs/open-iscsi.interface
+    if [ -f "$ifile" ] && read iface < "$ifile" &&
        ! grep -qs "^$iface=" /run/network/ifstate; then
-	mkdir -p /run/network
-	echo "$iface=$iface" >>/run/network/ifstate
-    fi
-    if [ -x /etc/network/if-up.d/upstart ]; then
-        IFACE=$iface LOGICAL=$iface ADDRFAM=inet METHOD=manual /etc/network/if-up.d/upstart
+        mkdir -p /run/network
+        echo "$iface=$iface" >>/run/network/ifstate
+
+        if [ -x /etc/network/if-up.d/upstart ]; then
+            IFACE=$iface LOGICAL=$iface ADDRFAM=inet METHOD=manual /etc/network/if-up.d/upstart
+        fi
+
+        if command -v resolvconf >/dev/null &&
+           [ -f /run/net-$iface.conf ]; then
+            . "/run/net-$iface.conf"
+            R=""
+            [ -n "$DOMAINSEARCH" ] && R="$R${CR}domainsearch $DOMAINSEARCH"
+            for ns in "$IPV4DNS0" "$IPV4DNS1"; do
+                [ -n "$ns" -a "$ns" != "0.0.0.0" ] && R="$R${CR}nameserver $ns"
+            done
+            [ -z "${R}" ] || resolvconf -a $iface.iscsi-network <<EOF
+${R#${CR}}
+EOF
+        fi
     fi
 end script
 
 post-stop script
-    if iface="$(cat /run/initramfs/open-iscsi.interface)" && [ "$iface" ] &&
+    ifile=/run/initramfs/open-iscsi.interface
+    if [ -f "$ifile" ] && read iface < "$ifile" &&
        grep -qs "^$iface=" /run/network/ifstate; then
-	grep -v "^$iface=" /run/network/ifstate >/run/network/.ifstate.tmp || true
-	mv /run/network/.ifstate.tmp /run/network/ifstate
+        grep -v "^$iface=" /run/network/ifstate >/run/network/.ifstate.tmp || true
+        mv /run/network/.ifstate.tmp /run/network/ifstate
+
+        if command -v resolvconf >/dev/null; then
+            resolvconf -d $iface.iscsi-network
+        fi
     fi
 end script
diff -u open-iscsi-2.0.871/debian/extra/initramfs.local-top open-iscsi-2.0.871/debian/extra/initramfs.local-top
--- open-iscsi-2.0.871/debian/extra/initramfs.local-top
+++ open-iscsi-2.0.871/debian/extra/initramfs.local-top
@@ -19,7 +19,12 @@
 {
 	configure_networking || return $?
 
-	if [ -n "${DEVICE}" ] && [ -e "/tmp/net-${DEVICE}.conf" ]; then
+	# if ipconfig wrote to /tmp, copy its output to /run
+	if [ -n "${DEVICE}" ] && [ -e "/tmp/net-${DEVICE}.conf" ] &&
+	   [ ! -e "/run/net-${DEVICE}.conf" ]; then
+		cp "/tmp/net-${DEVICE}.conf" "/run/net-${DEVICE}.conf"
+	fi
+	if [ -n "${DEVICE}" ] && [ -e "/run/net-${DEVICE}.conf" ]; then
 		echo "${DEVICE}" >/run/initramfs/open-iscsi.interface
 	fi
 
@@ -48,7 +53,7 @@
 		[ ${retry_nr} -gt 0 ] && \
 		[ "$quiet" != "y" ] && log_begin_msg "Retrying network configuration"
 		# Run this in a subshell, since a failed attempt to source
-		# /tmp/net-*.conf would otherwise cause this whole script to
+		# /run/net-*.conf would otherwise cause this whole script to
 		# exit.
 		if (try_configure_networking); then
 			[ ${retry_nr} -gt 0 ] && [ "$quiet" != "y" ] && log_end_msg