diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-10 18:46:05 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-10 18:46:05 +0100 |
| commit | 8e6ba742f744093c36faac73bf38fad613fe3bf2 (patch) | |
| tree | 5dbbecb095ac480b0b834aa818054e498461a83c /src | |
| parent | 0a5edb1d93e3a03f8ed01ad2069dbba361806241 (diff) | |
maybe a fix for the fstab
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 12 | ||||
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index b4818fc..ef4a666 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -1,7 +1,7 @@ #!/bin/sh TMP_DEV_MAP=/home/arch/fifa/runtime/dev.map - +TMP_FSTAB=/home/arch/fifa/runtime/.fstab # procedural code from quickinst functionized and fixed. # there were functions like this in the setup script too, with some subtle differences. see below @@ -259,12 +259,12 @@ _mkfs() { if [ -n "${_uuid}" ]; then _device="UUID=${_uuid}" fi - echo -n "${_device} ${_mountpoint} ${_fstype} defaults 0 " >>/tmp/.fstab + echo -n "${_device} ${_mountpoint} ${_fstype} defaults 0 " >>$TMP_FSTAB if [ "${_fstype}" = "swap" ]; then - echo "0" >>/tmp/.fstab + echo "0" >>$TMP_FSTAB else - echo "1" >>/tmp/.fstab + echo "1" >>$TMP_FSTAB fi } @@ -276,11 +276,11 @@ _mkfs() { # target_configure_fstab() { - if [ -f /home/arch/fifa/runtime/.fstab ] + if [ -f $TMP_FSTAB ] then # comment out stray /dev entries sed -i 's/^\/dev/#\/dev/g' $var_TARGET_DIR/etc/fstab # append entries from new configuration - sort /home/arch/fifa/runtime/.fstab >>$var_TARGET_DIR/etc/fstab + sort $TMP_FSTAB >>$var_TARGET_DIR/etc/fstab fi } diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index e711b74..1ccb471 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -219,7 +219,7 @@ interactive_autoprepare() return 1 fi - rm -f /tmp/.fstab + rm -f $TMP_FSTAB target_umountall @@ -289,7 +289,7 @@ EOF interactive_mountpoints() { while [ "$PARTFINISH" != "DONE" ]; do - : >/tmp/.fstab + : >/$TMP_FSTAB : >/tmp/.parts # Determine which filesystems are available |