X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_sbin%2Fprepare_tmpfs.sh;h=229fa797a1f8d8767cc536050890cc377a93a45c;hb=3b069a494fe989e75be26e5bc50efd8bb35d3109;hp=4b393f2fe7e993c31020ed023c78b52c4610dfa9;hpb=e720deae78f1eda5e6f62629606c194f16796762;p=grml-scripts.git

diff --git a/usr_sbin/prepare_tmpfs.sh b/usr_sbin/prepare_tmpfs.sh
index 4b393f2..229fa79 100755
--- a/usr_sbin/prepare_tmpfs.sh
+++ b/usr_sbin/prepare_tmpfs.sh
@@ -1,13 +1,12 @@
 #!/bin/zsh
 # Filename:      prepare_tmpfs.sh
-# Purpose:       setup a tmpfs
+# Purpose:       set up a tmpfs of a selected directory
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Mai 27 15:13:03 CEST 2006 [mika]
 ################################################################################
 
-if [ $UID != 0 ]; then
+if [ $(id -u) != 0 ] ; then
   echo "Error: $0 requires root permissions. Exiting."
   exit 1
 fi
@@ -23,12 +22,10 @@ if ! [ -n "$1" -a -n "$2" ] ; then
   exit 1
 fi
 
-[ -d /UNIONFS ] && UNIONFS="/UNIONFS" # running from live-CD?
-
 DIRECTORY="$1"
 
 prepare_start () {
-  if ! mount | grep -q "tmpfs on ${UNIONFS}${DIRECTORY}" ; then
+  if ! mount | grep -q "tmpfs on ${DIRECTORY}" ; then
    if [ -d $DIRECTORY ] ; then
     if ! [ -d $DIRECTORY.tmpfile ] ; then
      echo -n "Setting up tmpfs ${DIRECTORY}: "
@@ -58,7 +55,7 @@ prepare_start () {
 prepare_stop () {
   if mount | grep -q $DIRECTORY ; then
     echo -n "Unmounting tmpfs ${DIRECTORY}: "
-    umount ${UNIONFS}${DIRECTORY} && \
+    umount ${DIRECTORY} && \
     rmdir $DIRECTORY && \
     mv $DIRECTORY.tmpfile $DIRECTORY && echo done || echo failed
   else