~ubuntu-branches/ubuntu/lucid/user-setup/lucid-201002122356

« back to all changes in this revision

Viewing changes to user-setup-apply

  • Committer: Bazaar Package Importer
  • Author(s): Evan Dandrea
  • Date: 2009-08-19 15:05:13 UTC
  • Revision ID: james.westby@ubuntu.com-20090819150513-f0xffnq26hidw1nd
Tags: 1.27ubuntu8
Mount /proc, bind-mount /dev, and pass the necessary options for
ecryptfs-setup-swap.

Show diffs side-by-side

added added

removed removed

Lines of Context:
145
145
                for module in aes cbc ecb; do
146
146
                        modprobe -q "$module" || true
147
147
                done
148
 
                if ! $log $chroot $ROOT ecryptfs-setup-swap; then
 
148
                
 
149
                $log $chroot $ROOT mount -t proc proc /proc
 
150
                mount --bind /dev $ROOT/dev
 
151
                if ! $log $chroot $ROOT ecryptfs-setup-swap -f -n; then
149
152
                        echo "ecryptfs-setup-swap failed." >&2
150
153
                        db_input critical user-setup/encrypt-home-failed || true
151
154
                        db_go || true
 
155
                        ENCRYPT_HOME="false"
 
156
                        ENCRYPT_HOME_OPT=
152
157
                fi
 
158
                $log $chroot $ROOT umount /proc
 
159
                umount $ROOT/dev
153
160
        fi
154
161
 
155
162