Update unionroot and make it ok for unionroot-utils

BKrev: 41f56ee7rTGHTsscs0Cx_5yS1RQSZg

2 files changed, 130 insertions, 0 deletions

diff --git a/packages/unionfs/unionroot/init.unionroot b/packages/unionfs/unionroot/init.unionroot
index e69de29bb2..90aa4b015e 100644
--- a/packages/unionfs/unionroot/init.unionroot
+++ b/packages/unionfs/unionroot/init.unionroot
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+INIT=/sbin/init.sysvinit
+#OVERLAYS=/media/ram /media/cf /media/card
+ROOTBACKUP=/media/realroot
+UNION=/media/union
+PATH=/usr/bin:/usr/sbin:/bin:/sbin
+
+if ! test -e ${INIT}; then
+	echo >&2 "ERROR: ${INIT} not found"
+	exit 1
+fi
+
+if test x"$*" != "x"; then
+	exec ${INIT} $*
+fi
+
+if ! which unionctl; then
+	exec ${INIT}
+fi
+
+nodupmount () {
+	opts=""
+	type=""
+	while true; do
+		if test "$1" = "-o"; then
+			shift
+			opts="-o $1"
+			shift
+		elif test "$1" = "-t"; then
+			shift
+			type="$1"
+			shift
+		else
+			break
+		fi
+	done
+	if test x"$2" = "x"; then
+		mountpt="$1"
+	else
+		device="$1"
+		mountpt="$2"
+	fi
+	mountmatch="^[^ ]+ $mountpt $type"
+	# echo "NOTE: grep -E -q \"$mountmatch\" /proc/mounts"
+	if grep -E -q "$mountmatch" /proc/mounts; then
+		return 0;
+	fi
+	if test x"$type" != "x"; then
+		type="-t $type"
+	fi
+	echo >&2 "NOTE: executing mount $type $opts $device $mountpt"
+	mkdir -p $mountpt
+	/bin/mount.busybox $type $opts $device $mountpt
+	ret="$?"
+	if test "$ret" = "0"; then
+		wemounted="$wemounted $mountpt"
+	fi
+	return $ret
+}
+
+#set -x
+wemounted=""
+(
+	set -e
+	/bin/mount.busybox /proc
+	insmod /lib/modules/`uname -r`/kernel/fs/unionfs.o
+	nodupmount -t unionfs -o dirs=/.=rw none ${UNION}
+#	nodupmount -o bind / ${UNION}/${ROOTBACKUP}
+#	for OVERLAY in ${OVERLAYS}; do
+#		nodupmount ${OVERLAY}
+#		union-ctl /. --add --mode rw ${OVERLAY}
+#		nodupmount -o bind ${OVERLAY} ${UNION}/${OVERLAY}
+#	done
+	/bin/umount.busybox /proc
+#	nodupmount -o bind /proc ${UNION}/proc
+#	nodupmount -o bind / ${ROOTBACKUP}
+) || (
+	echo >&2 "ERROR: unable to setup mounts for chroot";
+	if test x"$wemounted" != "x"; then
+		# cleanup
+		for mount in $wemounted; do
+			/bin/umount.busybox $mount
+		done
+	fi
+	exec ${INIT}
+)
+cd ${UNION}
+pivot_root . ./${ROOTBACKUP}
+exec chroot . ${INIT}
diff --git a/packages/unionfs/unionroot_0.1.bb b/packages/unionfs/unionroot_0.1.bb
index e69de29bb2..0adb535511 100644
--- a/packages/unionfs/unionroot_0.1.bb
+++ b/packages/unionfs/unionroot_0.1.bb
@@ -0,0 +1,40 @@
+LICENSE = "GPL"
+
+DESCRIPTION = "Provides an init script that changes the root file-system to unionfs."
+DEPENDS = "base-files"
+RDEPENDS = "base-files"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
+
+PR = "r1"
+
+SRC_URI = "file://init.unionroot"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "init"
+ALTERNATIVE_LINK = "/sbin/init"
+ALTERNATIVE_PATH = "/sbin/init.unionroot"
+ALTERNATIVE_PRIORITY = "100"
+
+do_install () {
+        install -d ${D}/sbin
+        install -m 0755 ${WORKDIR}/init.unionroot ${D}/sbin/
+}
+
+pkg_postinst () {
+	# Alter /etc/fstab
+	mv $D/${sysconfdir}/fstab $D/${sysconfdir}/fstab.old
+	awk 'BEGIN { print "# Altered by unionroot" }
+		   { if ( $2 == "/" )
+		     {
+		     	print $1 "\t/media/realroot\t" $3 "\t" $4 "\t" $5 "\t" $6
+		     }
+		     else
+		     {
+		     	print $0
+		     }
+		   }' $D/${sysconfdir}/fstab.old > $D/${sysconfdir}/fstab
+}
+