merge of 60b47beac72c6f1f23514b42a309716b470d471b

     and a6f1ef5bbb3cac8192d0a7bc6d5c64b301e70463

39 files changed, 404 insertions, 123 deletions

diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index d546ed5c09..ec58e08bef 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r37"
+PR = "r38"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -126,6 +126,7 @@ do_install_append_openslug() {
 	rm -r ${D}/mnt/*
 	rmdir ${D}/home/root
 	install -m 0755 -d ${D}/root
+	ln -s ../root ${D}/home/root
 }
 
 PACKAGES = "${PN}-doc ${PN}"
diff --git a/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch
index e8b6ba59b5..0f97865c3f 100644
--- a/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch
+++ b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch
@@ -5,7 +5,7 @@
  
  gen: gen.c
 -	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-+	cc ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++	${BUILD_CC} ${EXT_CFLAGS} ${BUILD_CFLAGS} ${ALL_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
  
  rbtdb64.@O@: rbtdb.c
  
diff --git a/packages/classpath/classpath_0.16.bb b/packages/classpath/classpath_0.17.bb
index ec29ad9cb8..ec29ad9cb8 100644
--- a/packages/classpath/classpath_0.16.bb
+++ b/packages/classpath/classpath_0.17.bb
diff --git a/packages/flite/flite-1.2/configure-with-audio.patch b/packages/flite/flite-1.2/configure-with-audio.patch
new file mode 100644
index 0000000000..4f320ac068
--- /dev/null
+++ b/packages/flite/flite-1.2/configure-with-audio.patch
@@ -0,0 +1,20 @@
+*** flite-1.2-release/configure.in~	Tue Feb 18 01:45:45 2003
+--- flite-1.2-release/configure.in	Mon Jul 18 22:01:25 2005
+***************
+*** 144,150 ****
+  dnl
+  AC_ARG_WITH( audio,
+  	[  --with-audio          with specific audio support (none linux freebsd etc) ],
+!         AUDIODRIVER=$with_audio )
+  
+  if test "x$AUDIODEFS" = x; then
+      case "$AUDIODRIVER" in
+--- 144,151 ----
+  dnl
+  AC_ARG_WITH( audio,
+  	[  --with-audio          with specific audio support (none linux freebsd etc) ],
+!         [AUDIODRIVER=$with_audio
+!          AUDIODEFS=])
+  
+  if test "x$AUDIODEFS" = x; then
+      case "$AUDIODRIVER" in
diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb
index b8696fd829..c9a3e71e92 100644
--- a/packages/flite/flite_1.2.bb
+++ b/packages/flite/flite_1.2.bb
@@ -1,14 +1,15 @@
-SECTION = "console/utils"
-HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/"
-DESCRIPTION = "festival light speech synthesizer"
+DESCRIPTION = "flite - the festival light speech synthesizer"
 PRIORITY = "optional"
+HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/"
+SECTION = "console/utils"
 LICENSE = "flite"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r1"
+MAINTAINER = "Patrick Ohly <Patrick.Ohly@gmx.de>"
+PR = "r2"
 
 PARALLEL_MAKE = ""
 
 SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \
+           file://configure-with-audio.patch;patch=1 \
            file://fix-read-only-assignments.patch;patch=1"
 S = "${WORKDIR}/flite-${PV}-release"
 
diff --git a/packages/ftpd-topfield/files/init b/packages/ftpd-topfield/files/init
index a4cd501e10..0816e8bb7d 100644
--- a/packages/ftpd-topfield/files/init
+++ b/packages/ftpd-topfield/files/init
@@ -2,7 +2,7 @@
 DAEMON=/usr/sbin/ftpd-topfield
 NAME=ftpd-topfield
 DESC="FTP daemon for the Topfield PVR"
-ARGS="-D -e"
+ARGS="-D -P 21 -e"
 
 test -f $DAEMON || exit 0
 
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb
index 625cbe28fb..6a6665c8ed 100644
--- a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb
@@ -8,7 +8,7 @@ LICENSE = "MIT"
 
 DEPENDS = "libusb"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_1 \
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_2 \
 	   cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \
 	   file://init"
 
diff --git a/packages/gaim/files/desktop-name_1.4.0.patch b/packages/gaim/files/desktop-name_1.4.0.patch
new file mode 100644
index 0000000000..3cfaa5771e
--- /dev/null
+++ b/packages/gaim/files/desktop-name_1.4.0.patch
@@ -0,0 +1,11 @@
+--- gaim-1.4.0/gaim.desktop.old	2005-07-15 00:58:50.000000000 +0200
++++ gaim-1.4.0/gaim.desktop	2005-07-15 00:59:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ 
+-Name=Gaim Internet Messenger
++Name=Gaim
+ Name[ca]=Missatger d'Internet Gaim
+ Name[cs]=Gaim Internet Messenger
+ Name[da]=Gaim - internet beskeder
diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/gaim/gaim_1.4.0.bb
new file mode 100644
index 0000000000..ec55ea5b94
--- /dev/null
+++ b/packages/gaim/gaim_1.4.0.bb
@@ -0,0 +1,9 @@
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+	file://desktop-name_1.4.0.patch;patch=1"
+
+include gaim.inc
+
+CFLAGS += "-D_GNU_SOURCE"
+
diff --git a/packages/gpgme/gpgme_1.0.3.bb b/packages/gpgme/gpgme_1.0.3.bb
new file mode 100644
index 0000000000..8292991a89
--- /dev/null
+++ b/packages/gpgme/gpgme_1.0.3.bb
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz"
+PR = "r1"
+
+DEPENDS = "libgpg-error pth libassuan"
+
+EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
+
+inherit autotools binconfig
+
+do_stage() {
+	autotools_stage_includes
+
+	install -d ${STAGING_LIBDIR}
+	oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR}
+	oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR}
+	oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR}
+
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
+}
+
diff --git a/packages/gpsd/gpsd_2.26.bb b/packages/gpsd/gpsd_2.28.bb
index cd5e223142..cd5e223142 100644
--- a/packages/gpsd/gpsd_2.26.bb
+++ b/packages/gpsd/gpsd_2.28.bb
diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb
new file mode 100644
index 0000000000..0dc0bdbe7d
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb
@@ -0,0 +1,30 @@
+inherit autotools pkgconfig
+
+PR = "r0"
+DEFAULT_PREFERENCE="-1"
+
+PACKAGES += "gpsdrive-add"
+DESCRIPTION = "GPS navigation/map display software"
+DEPENDS = "virtual/libc gtk+ pcre gpsd"
+RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+SECTION = "x11"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.ostertag.name/tweety/Projekte/gpsdrive/gpsdrive-2.10pre3.tar.gz \
+           file://gpsdrive.desktop"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += "${datadir}/${PN}"
+
+FILES_gpsdrive-add = "${libdir}"
+ 
+EXTRA_OECONF = "--disable-garmin"
+
+do_install_append () {
+        mkdir -p  ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop
+}
diff --git a/packages/kdepimpi/kdepimpi_2.1.13.bb b/packages/kdepimpi/kdepimpi_2.1.16.bb
index f3dde1a2fd..f3dde1a2fd 100644
--- a/packages/kdepimpi/kdepimpi_2.1.13.bb
+++ b/packages/kdepimpi/kdepimpi_2.1.16.bb
diff --git a/packages/kdepimpi/pwmpi_2.1.13.bb b/packages/kdepimpi/pwmpi_2.1.16.bb
index 904f640955..904f640955 100644
--- a/packages/kdepimpi/pwmpi_2.1.13.bb
+++ b/packages/kdepimpi/pwmpi_2.1.16.bb
diff --git a/packages/libgpelaunch/libgpelaunch_0.12.bb b/packages/libgpelaunch/libgpelaunch_0.12.bb
index 3178955d79..d42414d0d0 100644
--- a/packages/libgpelaunch/libgpelaunch_0.12.bb
+++ b/packages/libgpelaunch/libgpelaunch_0.12.bb
@@ -2,7 +2,7 @@ LICENSE = "LGPL"
 DESCRIPTION = "GPE program launcher library"
 SECTION = "libs"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ startup-notification"
+DEPENDS = "gtk+ libgpewidget startup-notification"
 
 inherit autotools pkgconfig
 
diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0
index 8e4712da4f..b6b7cbc17d 100644
--- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0
@@ -724,13 +724,13 @@ CONFIG_PCMCIA_PCNET=m
 # Wan interfaces
 #
 # CONFIG_WAN is not set
-CONFIG_PPP=m
+CONFIG_PPP=y
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=m
+CONFIG_PPP_ASYNC=y
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_BSDCOMP=y
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb
index fc519ecfbc..fe94202c9d 100644
--- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r4"
+PR = "r5"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index 44f466ef49..f5d7135c88 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -211,10 +211,12 @@ inherit kernel
 
 ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
-# To specify the console set KERNEL_CONSOLE in the .bb
-# file.  The default is currently set in machine/nslu2.conf
+# To specify the console set KERNEL_CONSOLE in the .bb file.
+# CMDLINE_ROOT contains the boot options
 CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s"
-CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+# Add distro specific debug (or non-debug) options to this
+CMDLINE_DEBUG ?= ""
+CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}"
 
 # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as
 # required.  Notice that this has to be done for each separately built
diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb
index a47cd1d8da..174ed700e4 100644
--- a/packages/lzma/lzma-native_4.17.bb
+++ b/packages/lzma/lzma-native_4.17.bb
@@ -1,19 +1,22 @@
 DESCRIPTION = "LZMA is a general compression method. LZMA provides high compression ratio and very fast decompression."
 HOMEPAGE = "http://www.7-zip.org/"
 LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \
-	file://lzma-406-zlib-stream.patch;patch=1"
-S = "${WORKDIR}"
+	   file://lzma-406-zlib-stream.patch;patch=1;pnum=2"
+S = "${WORKDIR}/SRC"
 
 inherit native
 
+CFLAGS += "-c -I${S}"
+
 do_compile() {
-	make -C ${S}/SRC/7zip/Compress/LZMA_Alone
-	make -C ${S}/SRC/7zip/Compress/LZMA_Lib
+	oe_runmake -C 7zip/Compress/LZMA_Alone
+	oe_runmake -C 7zip/Compress/LZMA_Lib
 }
 
 do_stage () {
-	install -m 0755 ${S}/SRC/7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR}
-	oe_libinstall -a ${S}/SRC/7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR}
+	install -m 0755 7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR}
+	oe_libinstall -a 7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR}
 }
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 59f4ad9a24..9824134862 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -17,11 +17,11 @@ GPE_EXTRA_THEMES = "gtk-theme-industrial matchbox-themes-extra-industrial"
 
 #GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
 #GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
-GPE_EXTRA_DEPENDS_bigscreen = "minimo figment"
-GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_DEPENDS_bigscreen = "figment"
+GPE_EXTRA_INSTALL_bigscreen = " figment gpe-task-games ${GPE_EXTRA_THEMES}"
 
-GPE_EXTRA_DEPENDS_smallscreen = "minimo figment linphone-hh"
-GPE_EXTRA_INSTALL_smallscreen = "minimo figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_DEPENDS_smallscreen = "gpe-mini-browser figment linphone-hh"
+GPE_EXTRA_INSTALL_smallscreen = "gpe-mini-browser figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
 
 #h3900 has 32mb of *useable* flash
 #GPE_EXTRA_DEPENDS_append_h3900 = " vlc-gpe "
diff --git a/packages/mozilla/minimo/host_ldflags_fix.patch b/packages/mozilla/minimo/host_ldflags_fix.patch
index 06028c9bf9..f4ff51fae1 100644
--- a/packages/mozilla/minimo/host_ldflags_fix.patch
+++ b/packages/mozilla/minimo/host_ldflags_fix.patch
@@ -1,9 +1,4 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- mozilla/nsprpub/config/rules.mk~host_ldflags_fix.patch
+--- mozilla/nsprpub/config/rules.mk.old
 +++ mozilla/nsprpub/config/rules.mk
 @@ -87,6 +87,9 @@
  CCC=$(HOST_CXX)
@@ -15,12 +10,12 @@
  endif
  endif
  endif
---- mozilla/configure.in~host_ldflags_fix.patch
+--- mozilla/configure.in.old
 +++ mozilla/configure.in
-@@ -5496,12 +5496,17 @@
+@@ -6098,12 +6098,17 @@
  
  if test -n "$CROSS_COMPILE"; then
-     if test -z "$HOST_LIBIDL_CONFIG"; then
+      if test -z "$HOST_LIBIDL_CONFIG"; then
 +        AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
          HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
      fi
@@ -35,12 +30,12 @@
          HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
          HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
      fi
---- mozilla/configure~host_ldflags_fix.patch
+--- mozilla/configure.old
 +++ mozilla/configure
-@@ -16289,11 +16289,18 @@
+@@ -17604,11 +17604,18 @@
  
  if test -n "$CROSS_COMPILE"; then
-     if test -z "$HOST_LIBIDL_CONFIG"; then
+      if test -z "$HOST_LIBIDL_CONFIG"; then
 +        echo "HOST_LIBIDL_CONFIG nto defined"
          HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
      fi
diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions
index ac8e195abd..55f3397462 100755
--- a/packages/openslug-init/openslug-init-0.10/functions
+++ b/packages/openslug-init/openslug-init-0.10/functions
@@ -209,10 +209,13 @@ ifup(){
 	# is not left running so this will only work for
 	# the lease length time!
 	ifconfig "$iface" up
-	test -n "$hostname" && HOSTNAME="-H $hostname"
-	# The script writes the required shell variable assignments
-	# to file descriptor 9
-	eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null)
+	if test "$(config boot)" != static
+	then
+		test -n "$hostname" && HOSTNAME="-H $hostname"
+		# The script writes the required shell variable assignments
+		# to file descriptor 9
+		eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null)
+	fi
 
 	test -n "$broadcast" && BROADCAST="broadcast $broadcast"
 	test -n "$subnet" && NETMASK="netmask $subnet"
@@ -236,11 +239,18 @@ ifdown(){
 	ifconfig "$1" down
 }
 #
-# mountflash "flash root directory" {mount options}
+# mountflash "flash device" "flash root directory" {mount options}
 #  Finds and mounts the flash file system on the given directory
 mountflash() {
 	local ffsdev ffsdir
 
+	ffsdev="$1"
+	test -n "$ffsdev" -a -b "$ffsdev" || {
+		echo "$0: unable to find flash file system to copy ($ffsdev)" >&2
+		return 1
+	}
+	shift
+
 	ffsdir="$1"
 	test -n "$ffsdir" -a -d "$ffsdir" || {
 		echo "$0: mountflash $ffsdir: not a directory (internal error)" >&2
@@ -248,14 +258,71 @@ mountflash() {
 	}
 	shift
 
-	ffsdev="$(mtblockdev Flashdisk)"
-	test -n "$ffsdev" -a -b "$ffsdev" || {
-		echo "$0: unable to find flash file system to copy ($ffsdev)" >&2
-		return 1
-	}
 	mount -t jffs2 "$@" "$ffsdev" "$ffsdir" || {
 		echo "$0: $ffsdev: unable to mount flash file system on $ffsdir" >&2
 		return 1
 	}
 	return 0
 }
+#
+# umountflash [-r] "flash device"
+#  unmount any instance of the given flash device, if -r is specified a mount on
+#  root is an error, otherwise a mount on root is ignored (and remains).
+umountflash() {
+	local rootok ffsno ffsdev
+	rootok=1
+	case "$1" in
+	-r)	rootok=
+		shift;;
+	esac
+	#
+	# The argument is ffsdev
+	ffsdev="$1"
+	ffsno="$(devio "<<$ffsdev" prd)"
+	test -n "$ffsno" -a "$ffsno" -ge 0 || {
+		echo "$0: $ffsdev: device number $ffsno is not valid, cannot continue." >&2
+		return 1
+	}
+	#
+	# Make sure that Flashdisk isn't mounted on /
+	if test -z "$rootok" -a "$(devio "<</etc/init.d/sysconfsetup" prd)" -eq "$ffsno"
+	then
+		echo "$0: $ffsdev is mounted on /, use turnup ram" >&2
+		return 1
+	fi
+	#
+	# The function is currently always used interactively, so output 
+	echo "$0: umounting any existing mount of $ffsdev" >&2
+	#
+	# check each mount point, do this last first because otherwise nested
+	# mounts of ffsdev cannot be umounted.
+	ffs_umount() {
+		local device mp type options stuff
+
+		read device mp type options stuff
+		test -z "$device" && return 0
+
+		# handle following entries first
+		ffs_umount || return 1
+
+		# handle this entry, since this is currently only used for unmounting
+		# the flash root partition we know a file which must exist...
+		case "$mp/$type" in
+		//jffs2);; # skip /
+		*/jffs2)test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" ||
+			umount "$mp" || {
+				echo "$0: $mp: unable to umount $ffsdev" >&2
+				return 1
+			};;
+		esac
+
+		return 0
+	}
+	#
+	ffs_umount </proc/mounts || {
+		echo "$0: umount $ffsdev from all mount points then re-run reflash" >&2
+		return 1
+	}
+
+	return 0
+}
diff --git a/packages/openslug-init/openslug-init-0.10/reflash b/packages/openslug-init/openslug-init-0.10/reflash
index 504e78f694..bcf51fc606 100644
--- a/packages/openslug-init/openslug-init-0.10/reflash
+++ b/packages/openslug-init/openslug-init-0.10/reflash
@@ -213,59 +213,15 @@ then
 		exit 1
 	}
 fi
-#
-# find the device number of the flash partition then make sure it isn't
-# mounted anywhere.
-if test -n "$ffsdev"
-then
-	ffsno="$(devio "<<$ffsdev" prd)"
-	test -n "$ffsno" -a "$ffsno" -ge 0 || {
-		echo "reflash: $ffsdev: device number $ffsno is not valid, cannot continue." >&2
-		exit 1
-	}
-	#
-	# Make sure that Flashdisk isn't mounted on /
-	if test "$(devio "<</etc/init.d/sysconfsetup" prd)" -eq "$ffsno"
-	then
-		echo "reflash: $ffsdev is mounted on /, use turnup ram to reflash" >&2
-		exit 1
-	fi
-fi
+
 #
 # INPUTS OK, ENVIRONMENT OK, UMOUNT ANY EXISTING MOUNT OF THE FLASHDISK
 # ---------------------------------------------------------------------
 # This is only required if the device is going to be used
 if test -n "$ffsdev"
 then
-	echo "reflash: umounting any existing mount of $ffsdev" >&2
-	#
-	# check each mount point, do this last first because otherwise nested
-	# mounts of ffsdev cannot be umounted.
-	ffs_umount() {
-		local device mp type options stuff
-
-		read device mp type options stuff
-		test -z "$device" && return 0
-
-		# handle following entries first
-		ffs_umount || return 1
-
-		# handle this entry
-		case "$type" in
-		jffs2)	test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd)" -ne "$ffsno" ||
-			umount "$mp" || {
-				echo "reflash: $mp: unable to umount $ffsdev" >&2
-				return 1
-			};;
-		esac
-
-		return 0
-	}
-	#
-	ffs_umount </proc/mounts || {
-		echo "reflash: umount $ffsdev from all mount points then re-run reflash" >&2
-		exit 1
-	}
+	# -r causes this to fail if the flash device is mounted on /
+	umountflash -r "$ffsdev" || exit 1
 	#
 	# Everything is umounted, now remount on a temporary directory.
 	ffsdir="/tmp/flashdisk.$$"
@@ -274,7 +230,7 @@ then
 		exit 1
 	}
 	#
-	mountflash "$ffsdir" -o ro || {
+	mountflash "$ffsdev" "$ffsdir" -o ro || {
 		rmdir "$ffsdir"
 		exit 1
 	}
@@ -471,7 +427,7 @@ echo "reflash: restoring saved configuration files" >&2
 # /etc/rcS.d/S99finish on first boot (if it does not exist).  We need
 # a timestamp earlier than any files we create so touch it here, this
 # also acts as a test on the mounted file system
-mountflash "$ffsdir" && :>"$ffsdir/etc/.configured" || {
+mountflash "$ffsdev" "$ffsdir" && :>"$ffsdir/etc/.configured" || {
 	rmdir "$ffsdir"
 	echo "reflash: mount of new flash root file system failed" >&2
 	if test -d "$ffsdir/etc"
diff --git a/packages/openslug-init/openslug-init-0.10/turnup b/packages/openslug-init/openslug-init-0.10/turnup
index ce504b022e..0029697c50 100644
--- a/packages/openslug-init/openslug-init-0.10/turnup
+++ b/packages/openslug-init/openslug-init-0.10/turnup
@@ -4,10 +4,13 @@
 #
 . /etc/default/functions
 
+#
+# configuration
+#  The following variables control which directories in /var end up on the rootfs
+#  and which end up in a temporary file system.
 INRAM_MEMSTICK="/var/cache /var/lock /var/log /var/run /var/tmp /var/lib/ipkg"
-INRAM_NFS="/var/cache /var/run"
+INRAM_NFS="/var/cache /var/lock /var/run /var/tmp"
 INRAM_DISK=""
-
 #
 # force: override certain checks
 force=
@@ -61,6 +64,23 @@ fsoptions() {
 	fi
 }
 #
+# get_flash <directory> {mount options}
+#  mount the flash device, writeable, on the given directory
+get_flash() {
+	local ffsdir ffsdev
+
+	ffsdir="$1"
+	shift
+	test -n "$ffsdir" -a -d "$ffsdir" || {
+		echo "$0: $ffsdir: internal error, flash mount point not a directory" >&2
+		return 1
+	}
+
+	ffsdev="$(mtblockdev Flashdisk)"
+	umountflash "$ffsdev" &&
+	mountflash "$ffsdev" "$ffsdir" "$@"
+}
+#
 # check_rootfs [-i] <root fs directory>
 #  Make sure the candidate rootfs is empty
 check_rootfs() {
@@ -425,7 +445,7 @@ disk() {
 	}
 
 	# make sure we can get to the flash file system first
-	mountflash "$ffs" || {
+	get_flash "$ffs" || {
 		rmdir "$new" "$ffs"
 		return 1
 	}
@@ -509,7 +529,7 @@ boot_reset() {
 		return 1
 	}
 
-	mountflash "$ffs" || {
+	get_flash "$ffs" || {
 		rmdir "$ffs"
 		return 1
 	}
@@ -558,7 +578,7 @@ nfs() {
 	}
 
 	# make sure we can get to the flash file system first
-	mountflash "$ffs" || {
+	get_flash "$ffs" || {
 		rmdir "$new" "$ffs"
 		return 1
 	}
@@ -670,7 +690,7 @@ fix_hw_addr() {
 		# this isn't the flash device
 		ffs="/tmp/flashdisk.$$"
 		# make sure we c