diff options
author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-04 10:15:51 +0100 |
---|---|---|
committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-04 10:15:51 +0100 |
commit | 089b366d756b87f5d0459a11f08e2b5f3c431a16 (patch) | |
tree | 5a2dc199682b49e007778d263c7bcbb5958d6a9a | |
parent | 081052708813ff6b7fc6d492eff91f67f49c78bd (diff) |
tidy up tmp device map
-rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 8641dc4..161f118 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -1,5 +1,8 @@ #!/bin/sh +TMP_DEV_MAP=/home/arch/fifa/runtime/dev.map + + # procedural code from quickinst functionized and fixed. # there were functions like this in the setup script too, with some subtle differences. see below # NOTE: why were the functions in the setup called CHROOT_mount/umount? this is not chrooting ? @@ -152,8 +155,8 @@ findpartitions() { # taken from setup get_grub_map() { - rm /tmp/dev.map - $var_TARGET_DIR/sbin/grub --no-floppy --device-map /tmp/dev.map >/tmp/grub.log 2>&1 <<EOF + rm $TMP_DEV_MAP + $var_TARGET_DIR/sbin/grub --no-floppy --device-map $TMP_DEV_MAP >/tmp/grub.log 2>&1 <<EOF quit EOF } @@ -164,7 +167,7 @@ EOF mapdev() { partition_flag=0 device_found=0 - devs=$( grep -v fd /tmp/dev.map | sed 's/ *\t/ /' | sed ':a;$!N;$!ba;s/\n/ /g') + devs=$( grep -v fd $TMP_DEV_MAP | sed 's/ *\t/ /' | sed ':a;$!N;$!ba;s/\n/ /g') linuxdevice=$(echo $1 | cut -b1-8) if [ "$(echo $1 | egrep '[0-9]$')" ]; then # /dev/hdXY |