From 13f2ab4c2d889723f10ce69853fbf99592d9eb89 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Mon, 24 Jan 2005 20:31:15 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded 2005/01/24 16:05:06+00:00 (none)!cwiiis Change dests to use subdirs on external media. 2005/01/24 13:35:53+00:00 (none)!cwiiis Create mount-points for unionroot in base-files 2005/01/24 01:45:16+00:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded 2005/01/17 11:37:21+00:00 (none)!cwiiis Merge 2005/01/10 22:16:19+00:00 (none)!cwiiis Merge (re-enable unionfs 1.0.6) 2005/01/10 22:14:21+00:00 (none)!cwiiis Disable unionfs 1.0.6 (it doesn't build) 2005/01/09 14:37:38+00:00 (none)!cwiiis Merge 2005/01/09 14:34:29+00:00 (none)!cwiiis Make busybox use update-altnernatives for mount/umount 2005/01/09 14:30:22+00:00 (none)!cwiiis Fix silly typo in sysvinit (postinstall -> postinst) - sorry! BKrev: 41f55b13g5sI7GG_tujq2Yre1TVM9Q --- packages/busybox/busybox_1.00.bb | 18 +++++++++++++++++- packages/busybox/files/mount.busybox | 0 packages/busybox/files/umount.busybox | 0 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/busybox/files/mount.busybox create mode 100644 packages/busybox/files/umount.busybox (limited to 'packages/busybox') diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index e5458614b2..fe136407b7 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -31,7 +31,9 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://syslog \ file://hwclock.sh \ file://default.script \ - file://syslog.conf" + file://syslog.conf \ + file://mount.busybox \ + file://umount.busybox" S = "${WORKDIR}/busybox-${PV}" @@ -77,4 +79,18 @@ do_install () { install -m 0755 ${S}/examples/udhcp/simple.script ${D}/${sysconfdir}/udhcpc.d/50default install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script fi + rm ${D}/bin/mount + install -m 0755 ${WORKDIR}/mount.busybox ${D}/bin/ + rm ${D}/bin/umount + install -m 0755 ${WORKDIR}/umount.busybox ${D}/bin/ +} + +pkg_postinst () { + update-alternatives --install /bin/mount mount /bin/mount.busybox 50 + update-alternatives --install /bin/umount umount /bin/umount.busybox 50 +} + +pkg_prerm () { + update-alternatives --remove mount /bin/mount.busybox + update-alternatives --remove umount /bin/umount.busybox } diff --git a/packages/busybox/files/mount.busybox b/packages/busybox/files/mount.busybox new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/files/umount.busybox b/packages/busybox/files/umount.busybox new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3