← Back to branch summary

~ubuntu-branches/ubuntu/precise/partman-basicfilesystems/precise

« back to all changes in this revision

Viewing changes to active_partition/basicfilesystems/choices

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2008-11-11 09:01:11 UTC
  • mfrom: (0.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20081111090111-jbe0unzm36gser7l
Tags: 62ubuntu1
* Resynchronise with Debian. Remaining changes:
  - If partman/automount is preseeded to true, automatically mount
    partitions with usefully-mountable filesystems on subdirectories of
    /media.
  - Add minimal support for NTFS partitions using ntfs-3g.
  - Mount FAT and NTFS filesystems at boot (fstab pass 1).
  - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
  - When formatting over the top of an existing swap partition, preserve
    its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
    swap.
  - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
    file descriptor, to prevent log-output hanging when ntfs-3g is in use.
  - Special case loopmounted filesystems as it's safer to format the
    underlying file, not the device.
  - Default to mounting ext2 with relatime.

Show diffs side-by-side

added added

removed removed

Lines of Context:
active_partition/basicfilesystems/choices
34
34
                        mp="$RET"
35
35
                fi
36
36
                db_metaget partman-basicfilesystems/text/specify_mountpoint description
37
 
                RET=$(stralign -25 "$RET")
38
 
                printf "mountpoint\t%s%s\n" "$RET" "$mp"
 
37
                printf "mountpoint\t%s\${!TAB}%s\n" "$RET" "$mp"
39
38
                ;;
40
39
        esac
41
40
}
46
45
                return
47
46
        fi
48
47
        db_metaget partman-basicfilesystems/text/options description
49
 
        RET=$(stralign -25 "$RET")
50
 
        printf "options\t%s%.45s\n" "$RET" "$(get_mountoptions $dev $id)"
 
48
        printf "options\t%s\${!TAB}%.45s\n" "$RET" "$(get_mountoptions $dev $id)"
51
49
}
52
50
 
53
51
choice_format_swap () {
54
52
        if [ "$method" = swap ] && [ -f $part/detected_filesystem ] && \
55
53
           [ "$(cat $part/detected_filesystem)" = linux-swap ]; then
56
54
                db_metaget partman-basicfilesystems/text/format_swap description
57
 
                description=$(stralign -25 "$RET")
 
55
                description="$RET"
58
56
                if [ -f $part/format ]; then
59
57
                        db_metaget partman-basicfilesystems/text/yes description
60
 
                        printf "dont_format_swap\t%s%s\n" "$description" "${RET}"
 
58
                        printf "dont_format_swap\t%s\${!TAB}%s\n" "$description" "${RET}"
61
59
                else
62
60
                        db_metaget partman-basicfilesystems/text/no description
63
 
                        printf "format_swap\t%s%s\n" "$description" "${RET}"
 
61
                        printf "format_swap\t%s\${!TAB}%s\n" "$description" "${RET}"
64
62
                fi
65
63
        fi
66
64
}
80
78
                        label=$RET
81
79
                fi
82
80
                db_metaget partman-basicfilesystems/text/specify_label description
83
 
                RET=$(stralign -25 "$RET")
84
 
                printf "label\t%s%s\n" "$RET" "$label"
 
81
                printf "label\t%s\${!TAB}%s\n" "$RET" "$label"
85
82
                ;;
86
83
            _no_fat16|_no_fat32) # we dont have tools to set label of FAT file systems
87
84
                if [ -f $part/label ]; then
91
88
                        label=$RET
92
89
                fi
93
90
                db_metaget partman-basicfilesystems/text/specify_label description
94
 
                RET=$(stralign -25 "$RET")
95
 
                printf "label\t%s%s\n" "$RET" "$label"
 
91
                printf "label\t%s\${!TAB}%s\n" "$RET" "$label"
96
92
                ;;
97
93
        esac
98
94
}
111
107
                reserved=5
112
108
        fi
113
109
        db_metaget partman-basicfilesystems/text/reserved_for_root description
114
 
        RET=$(stralign -25 "$RET")
115
 
        printf "reserved_for_root\t%s%s\n" "$RET" "$reserved%"
 
110
        printf "reserved_for_root\t%s\${!TAB}%s\n" "$RET" "$reserved%"
116
111
}
117
112
 
118
113
choice_usage () {
130
125
                usage=$RET
131
126
        fi
132
127
        db_metaget partman-basicfilesystems/text/usage description
133
 
        RET=$(stralign -25 "$RET")
134
 
        printf "usage\t%s%s\n" "$RET" "$usage"
 
128
        printf "usage\t%s\${!TAB}%s\n" "$RET" "$usage"
135
129
}
136
130
 
137
131
choice_mountpoint