X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;h=83ae0d3c49f6d979e5ff5ae22c324f84cee371bf;hb=818e52abdc2bd149d994d55febf3f5435255a21b;hp=7434527c0d10c5dfdddb87b313f651ec54fddc97;hpb=b4a6ae42e5a421621ded27f18f5ea5a7a1ff3e88;p=grml-debootstrap.git

diff --git a/grml-debootstrap b/grml-debootstrap
index 7434527..83ae0d3 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -104,10 +104,10 @@ fi
 
 # cmdline handling {{{
 # source external command line parameter-processing script
-if [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then
-   . /usr/share/grml-debootstrap/functions/cmdlineopts.clp
-elif [ -r ./cmdlineopts.clp ] ; then
+if [ -r ./cmdlineopts.clp ] ; then
    . ./cmdlineopts.clp
+elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then
+   . /usr/share/grml-debootstrap/functions/cmdlineopts.clp
 else
    echo "Error: cmdline function file not found, exiting.">&2
    exit 1
@@ -566,11 +566,7 @@ fi
 PARTITION=''
 DIRECTORY=''
 
-case $TARGET in
-  /dev/*)
-    PARTITION=1
-    ;;
-  *)
+set_target_directory(){
     # assume we are installing into a directory, don't run mkfs and grub related stuff therefore
     DIRECTORY=1
     MNTPOINT="$TARGET"
@@ -578,7 +574,14 @@ case $TARGET in
     TUNE2FS=''
     FSCK=''
     GRUB=''
+}
+
+case $TARGET in
+  /dev/shm/*) set_target_directory ;;
+  /dev/*)
+    PARTITION=1
     ;;
+  *) set_target_directory ;;
 esac
 # }}}