Attachment 220455 Details for Bug 389672

mkinitrd.nfsroot.patch

mkinitrd.nfsroot.patch (text/plain), 2.49 KB, created by Olaf Hering on 2008-06-05 13:57:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Hering

Created: 2008-06-05 13:57:35 UTC

Size: 2.49 KB

patch

obsolete

>---
> scripts/boot-network.sh     |   19 ++++++++++++++++---
> scripts/setup-sharedlibs.sh |    6 +++---
> 2 files changed, 19 insertions(+), 6 deletions(-)
>
>--- a/scripts/boot-network.sh
>+++ b/scripts/boot-network.sh
>@@ -61,17 +61,19 @@ if [ "$ip" -a "$nettype" != "dhcp" ]; th
> fi
> 
> # dhcp based ip config
>-if [ "$nettype" = "static" ]; then
>+if [ "$nettype" = "dhcp" ]; then
>   # run dhcp
>   if [ "$interface" != "off" ]; then
>     # ifconfig lo 127.0.0.1 netmask 255.0.0.0 broadcast 127.255.255.255 up
>   
>     echo "running dhcpcd on interface $interface"
>-    dhcpcd -R -Y -N -t 60 $interface
>+    dhcpcd -R -Y -N -t 123 $interface
>     if [ -s /var/lib/dhcpcd/dhcpcd-$interface.info ] ; then
>       . /var/lib/dhcpcd/dhcpcd-$interface.info
>     else
>-      echo "no response from dhcp server."
>+      echo "no response from dhcp server -- exiting to /bin/sh"
>+      cd /
>+      PATH=$PATH PS1='$ ' /bin/sh -i
>     fi
>     [ -e "/var/run/dhcpcd-$interface.pid" ] && kill -9 $(cat /var/run/dhcpcd-$interface.pid)
>     if [ -n "$DNS" ]; then
>@@ -85,6 +87,17 @@ if [ "$nettype" = "static" ]; then
> 	  echo "search $DOMAIN" >> /etc/resolv.conf
>       fi
>       echo 'hosts: dns' > /etc/nsswitch.conf
>+    elif [ -n "$DNSSERVERS" ]; then
>+      oifs="$IFS"
>+      IFS=" "
>+      for ns in $DNSSERVERS ; do
>+        echo "nameserver $ns" >> /etc/resolv.conf
>+      done
>+      IFS="$oifs"
>+      if [ -n "$DNSDOMAIN" ]; then
>+	  echo "search $DNSDOMAIN" >> /etc/resolv.conf
>+      fi
>+      echo 'hosts: dns' > /etc/nsswitch.conf
>     fi
>   fi
>   
>--- a/scripts/setup-sharedlibs.sh
>+++ b/scripts/setup-sharedlibs.sh
>@@ -63,7 +63,7 @@ if [ -n "$lib_files" ]; then
>     case "$(uname -m)" in
> 	alpha|ia64)
> 	    mkdir -p $tmp_mnt/lib
>-	    lib_files="$lib_files `echo $root_dir/lib/libnss_files* $root_dir/lib/libgcc_s.so*`"
>+	    lib_files="$lib_files `echo $root_dir/lib/libnss_{dns,files}* $root_dir/lib/libgcc_s.so*`"
> 	    ;;
> 	*)
> 	    # no symlinks, most point into the running system
>@@ -72,11 +72,11 @@ if [ -n "$lib_files" ]; then
> 		case "$i" in
> 		    32-bit)
> 			mkdir -p $tmp_mnt/lib
>-			lib_files="$lib_files `echo $root_dir/lib/libnss_files* $root_dir/lib/libgcc_s.so*`"
>+			lib_files="$lib_files `echo $root_dir/lib/libnss_{dns,files}* $root_dir/lib/libgcc_s.so*`"
> 			;;
> 		    64-bit)
> 			mkdir -p $tmp_mnt/lib64
>-			lib_files="$lib_files `echo $root_dir/lib64/libnss_files* $root_dir/lib64/libgcc_s.so*`"
>+			lib_files="$lib_files `echo $root_dir/lib64/libnss_{dns,files}* $root_dir/lib64/libgcc_s.so*`"
> 			;;
> 		esac
> 	    done

Actions: View

Attachments on bug 389672: 214607 | 217251 | 220455