X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_sbin%2Fprepare_ramdisk.sh;h=e7018fb484db3b86c69e244de9b1627f3397a9e2;hb=b0c3e5ff760f99d6ff7721852bc1a0d73c5ea201;hp=092c87b481ac164309407153c369baa39b6ac5d5;hpb=e720deae78f1eda5e6f62629606c194f16796762;p=grml-scripts.git

diff --git a/usr_sbin/prepare_ramdisk.sh b/usr_sbin/prepare_ramdisk.sh
index 092c87b..e7018fb 100755
--- a/usr_sbin/prepare_ramdisk.sh
+++ b/usr_sbin/prepare_ramdisk.sh
@@ -1,13 +1,12 @@
 #!/bin/zsh
 # Filename:      prepare_ramdisk.sh
-# Purpose:       setup a ramdisk
+# Purpose:       set up a ramdisk 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:12:55 CEST 2006 [mika]
 ################################################################################
 
-if [ $UID != 0 ]; then
+if [ $(id -u) != 0 ] ; then
   echo "Error: $0 requires root permissions. Exiting."
   exit 1
 fi
@@ -23,8 +22,6 @@ if ! [ -n "$1" -a -n "$2" ] ; then
   exit 1
 fi
 
-[ -d /UNIONFS ] && UNIONFS="/UNIONFS" # running from live-CD?
-
 DIRECTORY="$1"
 FILENAME=$(echo $DIRECTORY | sed 's#/#_#g')
 CACHE_FILE="/ramdisk_cache/$FILENAME"
@@ -38,7 +35,7 @@ prepare_start () {
   fi
 
   if ! mount | grep -q "${DIRECTORY}.*loop" ; then
-   if [ -d $DIRECTORY ] ; then
+   if [ -d "$DIRECTORY" ] ; then
     if ! mount | grep -q "loop.*${DIRECTORY}" ; then
       mv $DIRECTORY/ $DIRECTORY.tmpfile && \
       mkdir $DIRECTORY
@@ -70,11 +67,10 @@ prepare_stop () {
     cp -a $DIRECTORY/.* $DIRECTORY.tmpfile/  &>/dev/null
     if umount $DIRECTORY ; then
       rmdir $DIRECTORY
-#      LOOPDEVICE=$(losetup -a | grep $CACHE_FILE | awk -F: '{print $1}')
-#      losetup -d $LOOPDEVICE && echo "done" || echo "failed"
       mv $DIRECTORY.tmpfile/ $DIRECTORY
+      echo done
     else
-      echo "Error when unmounting $DIRECTORY."
+      echo "error [while unmounting ${DIRECTORY}]"
     fi
   else
     echo "Error: $DIRECTORY not mounted."