← Back to branch summary

~bryce/ubiquity/free-pointer

« back to all changes in this revision

Viewing changes to d-i/source/partman-btrfs/mount.d/btrfs

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson, Jonathan Riddell, Evan Dandrea, Colin Watson
  • Date: 2011-02-01 14:42:55 UTC
  • Revision ID: james.westby@ubuntu.com-20110201144255-0qrmr5xx9b2nqmet
Tags: 2.5.13
https://launchpad.net/bugs/705915
https://launchpad.net/bugs/690726
[ Jonathan Riddell ]
* Fix layout issues in stepPartMan.ui and stepLanguage.ui LP: #705915

[ Evan Dandrea ]
* Show a Shutdown Now button (LP: #690726). Thanks Cyrus Lien!
* Only show the shutdown button if ubiquity/show_shutdown_button was
  preseeded true.
* Don't show a resize grip on the panel.

[ Colin Watson ]
* Automatic update of included source packages: base-installer
  1.115ubuntu1, choose-mirror 2.37ubuntu1, partman-btrfs 5ubuntu2,
  partman-ext3 62ubuntu1, yaboot-installer 1.1.19ubuntu1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
d-i/source/partman-btrfs/mount.d/btrfs
11
11
 
12
12
case $type in
13
13
    btrfs)
 
14
        options="${options%,subvol=*}"
 
15
        #for removing the option subvol,when thats the only option
 
16
        #eg: options=="subvol=@", no comma present
 
17
        options="${options%subvol=*}"
14
18
        mount -t btrfs ${options:+-o "$options"} $fs /target$mp || exit 1
 
19
        case $mp in
 
20
            /)
 
21
                btrfs subvolume create /target$mp/@
 
22
                umount /target$mp
 
23
                options="${options:+$options,}subvol=@"
 
24
                mount -t btrfs -o $options $fs /target$mp
 
25
                ;;
 
26
            /home)
 
27
                btrfs subvolume create /target$mp/@home
 
28
                umount /target$mp
 
29
                options="${options:+$options,}subvol=@home"
 
30
                mount -t btrfs -o $options $fs /target$mp
 
31
                ;;
 
32
        esac
15
33
        echo "umount /target$mp"
16
34
        exit 0
17
35
        ;;