34_ignore_unknown_filesystems.patch: also ignore fstype swap

[live-boot-grml.git] / debian / patches / 26_support_dns_bootoption.patch

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
index ce1fc47..2a5c862 100644 (file)
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -7,25 +7,15 @@
 @DPATCH@
 --- a/scripts/live
 +++ b/scripts/live
-@@ -77,6 +77,18 @@
-                               BOOTIF="${x#BOOTIF=}"
-                               ;;
+@@ -429,7 +429,7 @@
+                               echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
+                       fi
  
-+                      dns=*)
-+                              DNSSERVER="${ARGUMENT#*=}"
-+                              if echo "${DNSSERVER}" | grep -q , ; then
-+                                      DNSSERVER1="${DNSSERVER%,*}"
-+                                      DNSSERVER2="${DNSSERVER#*,}"
-+                                      export DNSSERVER1 DNSSERVER2
-+                              else
-+                                      DNSSERVER1="$DNSSERVER"
-+                                      export DNSSERVER1
-+                              fi
-+                              unset DNSSERVER
-+                              ;;
-                       debug)
-                               DEBUG="Yes"
-                               export DEBUG
+-                      for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
++                      for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVER1} ${DNSSERVER2}
+                       do
+                               if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
+                               then
 --- a/scripts/live-bottom/23networking_grml
 +++ b/scripts/live-bottom/23networking_grml
 @@ -44,7 +44,12 @@
@@ -60,3 +50,25 @@
 +              echo "nameserver $i" >> $RESOLVCONF
 +      done
 +fi
+--- a/scripts/live-helpers
++++ b/scripts/live-helpers
+@@ -59,6 +59,19 @@
+                               BOOTIF="${x#BOOTIF=}"
+                               ;;
+ 
++                      dns=*)
++                              DNSSERVER="${ARGUMENT#*=}"
++                              if echo "${DNSSERVER}" | grep -q , ; then
++                                      DNSSERVER1="${DNSSERVER%,*}"
++                                      DNSSERVER2="${DNSSERVER#*,}"
++                                      export DNSSERVER1 DNSSERVER2
++                              else
++                                      DNSSERVER1="$DNSSERVER"
++                                      export DNSSERVER1
++                              fi
++                              unset DNSSERVER
++                              ;;
++
+                       debug)
+                               DEBUG="Yes"
+                               export DEBUG