From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 14 May 2009 20:25:13 +0000 (+0200)
Subject: Removed mount.tmpfs.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b039bb368c0e844037df8dcaf5b10b67c882f3b;p=ipfire-3.x.git

Removed mount.tmpfs.
---

diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng
index a83120a8f..41b5ecfbe 100644
--- a/lfs/util-linux-ng
+++ b/lfs/util-linux-ng
@@ -112,9 +112,6 @@ ifeq "$(STAGE)" "base"
 	cd $(DIR_APP) && install -m 755 nologin /sbin
 	install -m 644 $(DIR_SOURCE)/$(PKG_NAME)/nologin.8 /usr/share/man/man8
 
-	# Install mount tmpfs helper
-	install -m 755 $(DIR_SOURCE)/$(PKG_NAME)/mount.tmpfs /sbin
-
 	ln -svf ../../sbin/hwclock /usr/sbin/hwclock
 	ln -svf hwclock /sbin/clock
 	ln -sf ../../bin/kill /usr/bin/kill
diff --git a/src/util-linux-ng/mount.tmpfs b/src/util-linux-ng/mount.tmpfs
deleted file mode 100644
index f862c03d9..000000000
--- a/src/util-linux-ng/mount.tmpfs
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/bash
-#
-# Copyright (C) 2009 Eric Paris <eparis@redhat.com>
-#                    Daniel Walsh <dwalsh@redhat.com>
-#                    Karel Zak <kzak@redhat.com>
-#
-# http://bugzilla.redhat.com/show_bug.cgi?id=476964
-#
-# Usage:
-# /sbin/mount.tmpfs spec dir [-sfnv] [-o options]
-#
-
-if ! echo "$@" | grep -q -E '(fs|def|root)?context='; then
-  con=$(ls --scontext -d "$2" | cut -f 1 -d ' ')
-  if [ -n "$con" ] && [ "$con" != "?" ] && [ "$con" != "unlabeled" ]; then 
-      exec /bin/mount "$@" -o "rootcontext=\"$con\"" -i -t tmpfs
-  fi
-fi
-
-exec /bin/mount "$@" -i -t tmpfs