diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-05-31 10:53:55 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:47:59 +0100 |
| commit | f7844126b88fd104016316b0dfa5a8c731a63a05 (patch) | |
| tree | 5f6b0f6cee38028df5adc949e54192ba905ceea4 /scripts/live | |
| parent | 9608fba805c3a518bd63a17dc138b8c0ed41b760 (diff) | |
| download | live-boot-f7844126b88fd104016316b0dfa5a8c731a63a05.tar.gz live-boot-f7844126b88fd104016316b0dfa5a8c731a63a05.zip | |
Merging casper 1.132.
Diffstat (limited to 'scripts/live')
| -rwxr-xr-x | scripts/live | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/scripts/live b/scripts/live index 867d4f9..29832c9 100755 --- a/scripts/live +++ b/scripts/live @@ -556,20 +556,6 @@ is_nice_device () return 1 } -is_supported_fs () -{ - # FIXME: do something better like the scan of supported filesystems - fstype="${1}" - - case ${fstype} in - vfat|iso9660|udf|ext2|ext3|ntfs|jffs2) - return 0 - ;; - esac - - return 1 -} - copy_live_to () { copyfrom="${1}" @@ -1164,6 +1150,19 @@ check_dev () devname="${loopdevname}" fi + if [ -d "${devname}" ] + then + mount -o bind "${devname}" $mountpoint || continue + + if is_live_path $mountpoint + then + echo $mountpoint + return 0 + else + umount $mountpoint + fi + fi + fstype=$(get_fstype "${devname}") if is_supported_fs ${fstype} |