diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-06-26 09:06:24 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-06-26 09:06:24 +0000 |
| commit | 4c8c2180d641189cf3c533ad1573b4a98ab1a7cb (patch) | |
| tree | c82d25d835aae400918d27b6d76668491be84d26 /packages/slugos-init/files/turnup | |
| parent | fc0177440fae7a5562916ee05e4cce2828525b1e (diff) | |
| parent | 4a04521a430f94e504fb7cf92759cad06b8fb61d (diff) | |
merge of '60f8ab65a31175b75e99193102e2ec70cbdfdef8'
and '6417986ed931c354e68da472aabbf608cb98eb63'
Diffstat (limited to 'packages/slugos-init/files/turnup')
| -rw-r--r-- | packages/slugos-init/files/turnup | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 10bccb8279..761e07829d 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -159,7 +159,7 @@ fsoptions() { # get_flash <directory> {mount options} # mount the flash device, writeable, on the given directory get_flash() { - local ffsdir ffsdev + local ffsdir ffspart ffsdev ffsdir="$1" shift @@ -169,9 +169,12 @@ get_flash() { } case "$(machine)" in - nslu2) ffsdev="$(mtblockdev Flashdisk)";; - *) ffsdev="$(mtblockdev filesystem)";; + nslu2) ffspart="Flashdisk";; + *) ffspart="filesystem";; esac + ffsdev="$(mtblockdev $ffspart)" + [ -n "$ffsdev" ] || \ + ffsdev="$(mtblockdev rootfs)" umountflash "$ffsdev" && mountflash "$ffsdev" "$ffsdir" "$@" } |