← Back to branch summary

~ubuntu-branches/ubuntu/hardy/partman-basicfilesystems/hardy

« back to all changes in this revision

Viewing changes to active_partition/basicfilesystems/do_option

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2006-05-03 12:29:34 UTC
  • Revision ID: james.westby@ubuntu.com-20060503122934-fwjrlkmfmtbvp9le
Tags: 46ubuntu5
Don't use the mountpoint as a default label (closes: Malone #21655).

Show diffs side-by-side

added added

removed removed

Lines of Context:
active_partition/basicfilesystems/do_option
107
107
    label)
108
108
        if [ -f $part/label ]; then
109
109
            label=$(cat $part/label)
110
 
        elif [ -f $part/mountpoint ]; then
111
 
            if [ "$filesystem" = ext2 ]; then
112
 
                label=$(cat $part/mountpoint)
113
 
            else
114
 
                label=$(sed s,.*/,, $part/mountpoint | tr a-z A-Z)
115
 
            fi
116
110
        else
117
111
            label=''
118
112
        fi