10 files changed, 35 insertions, 11 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 2df0e16792..d146b2ab45 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 IGNORE_STRIP_ERRORS = "1"
 
-PR = "r34"
+PR = "r35"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/altboot_1.0.6-rc1.bb b/packages/altboot/altboot_1.0.6-rc2.bb
index bb99fe31e5..bb99fe31e5 100644
--- a/packages/altboot/altboot_1.0.6-rc1.bb
+++ b/packages/altboot/altboot_1.0.6-rc2.bb
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index e01af7faad..e81526d251 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -30,12 +30,21 @@ run_module() {
 	
 	# After the PCMCIA service is started, an inserted WLAN card should automatically
 	# activate itself.
-	/etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia/start failed!"
-
+	
+	if test -x /etc/init.d/pcmcia
+	then
+		/etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia start failed!"
+	else	
+		# With kernel 2.6.16+ udev is used 
+		/etc/init.d/udev start >/dev/null 2>&1 || die "/etc/init.d/udev start failed!"
+	fi
+	
 	nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `"
 	nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`"
 	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"	
 	
+	WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | awk '{print $1}'`"
+	
 	if test -z "$nfs_host"
 	then
 		die "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET"
@@ -61,7 +70,8 @@ run_module() {
 				then
 					echo "Restarting udhcpc"
 					killall udhcpc
-					udhcpc -i wlan0 -H `cat /etc/hostname` >/dev/null 2>&1
+					
+					udhcpc -i "$WLAN_NIC" -H `cat /etc/hostname` >/dev/null 2>&1
 				else
 					die "Failed to activate WLAN!"
 					break			
diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh
index 99a469d576..bf498084e4 100755
--- a/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -85,8 +85,10 @@ apply_cfgfile() {
         echo "Cannot create link over existing -${TNAME}-." >&2
         } || {
         TSOURCE=`echo ${LINE} | cut -d " " -f 6`
-        [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
-        ln -s "${TSOURCE}" "${TNAME}"
+	[ -L "${TNAME}" ] || {
+          [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
+          ln -s "${TSOURCE}" "${TNAME}"
+	  }
         }
       continue
       }
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index ed4e205519..29886d0ac0 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r70"
+PR = "r71"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/udev/udev-084/init b/packages/udev/udev-084/init
index 3138e5554c..5a60d52a9a 100644
--- a/packages/udev/udev-084/init
+++ b/packages/udev/udev-084/init
@@ -204,12 +204,12 @@ case "$1" in
 
     stop)
     echo "Stopping the hotplug events dispatcher" "udevd"
-    start-stop-daemon --stop --name udevd --quiet --oknodo --retry 5
+    start-stop-daemon --stop --name udevd --quiet
     ;;
 
     restart|force-reload)
     echo "Stopping the hotplug events dispatcher" "udevd"
-    if start-stop-daemon --stop --name udevd --quiet --oknodo --retry 5; then
+    if start-stop-daemon --stop --name udevd --quiet ; then
 	exit 1
     fi
 
diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb
index 6bafa615d7..fc8a701684 100644
--- a/packages/udev/udev_084.bb
+++ b/packages/udev/udev_084.bb
@@ -13,7 +13,7 @@ include udev.inc
 
 INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ."
 
-PR = "r3"
+PR = "r4"
 
 FILES_${PN} += "${base_libdir}"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xserver-common/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver-common/files/.mtn2git_empty
diff --git a/packages/xserver-common/files/Xdefaults-200DPI.patch b/packages/xserver-common/files/Xdefaults-200DPI.patch
new file mode 100644
index 0000000000..8931bfd0a9
--- /dev/null
+++ b/packages/xserver-common/files/Xdefaults-200DPI.patch
@@ -0,0 +1,7 @@
+--- xserver-common-1.8/X11/Xdefaults.orig	2006-04-08 11:08:35.158478256 +0200
++++ xserver-common-1.8/X11/Xdefaults	2006-04-08 11:08:42.711330048 +0200
+@@ -1,3 +1,2 @@
+ Rxvt*scrollBar_right: true
+-Rxvt*font: xft:Mono:pixelsize=9
+-Xft.dpi: 100
++Rxvt*font: xft:Mono:pixelsize=12
diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb
index 125b138f02..19ae2ba851 100644
--- a/packages/xserver-common/xserver-common_1.8.bb
+++ b/packages/xserver-common/xserver-common_1.8.bb
@@ -3,9 +3,14 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r0"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 
 # we are using a gpe-style Makefile
 inherit gpe
+
+SRC_URI_append_akita = " file://Xdefaults-200DPI.patch;patch=1"
+SRC_URI_append_spitz = " file://Xdefaults-200DPI.patch;patch=1"
+SRC_URI_append_c7x0 = " file://Xdefaults-200DPI.patch;patch=1"
+SRC_URI_append_tosa = " file://Xdefaults-200DPI.patch;patch=1"