Convert code to use template from partman-basicfilesystems, and remove partman-btrfs/create_failed template.

r62478
This commit is contained in:
Joey Hess 2010-02-24 20:45:50 +00:00
parent 98c353fb55
commit be8b1a021e
2 changed files with 5 additions and 10 deletions

View file

@ -65,9 +65,11 @@ for dev in $DEVICES/*; do
db_progress STOP
if [ "$code" != 0 ]; then
db_subst partman-btrfs/create_failed PARTITION "$num"
db_subst partman-btrfs/create_failed DEVICE $(humandev $(cat device))
db_input critical partman-btrfs/create_failed || true
T=partman-basicfilesystems/create_failed
db_subst $T FILESYSTEM "$filesystem"
db_subst $T PARTITION "$num"
db_subst $T DEVICE $(humandev $(cat device))
db_input critical $T || true
db_go || true
#disable_swap
exit 1

View file

@ -1,10 +1,3 @@
Template: partman-btrfs/create_failed
Type: error
# :sl2:
_Description: Failed to create a file system
The btrfs file system creation in partition
#${PARTITION} of ${DEVICE} failed.
Template: partman-btrfs/text/btrfs
Type: text
# :sl2: