Commit b7c3604e authored by Colin Watson's avatar Colin Watson

Honour partman/default_filesystem when creating new partitions.

Requires partman-base 129.

r57521
parent 1471b414
......@@ -4,6 +4,8 @@ partman-partitioning (65) UNRELEASED; urgency=low
- Exit straight away if a called script is killed by a signal.
- Add lpia support to default_disk_label (Emmet Hikory).
- Add ext4 support.
- Honour partman/default_filesystem when creating new partitions.
Requires partman-base 129.
-- Colin Watson <cjwatson@debian.org> Fri, 26 Dec 2008 14:39:09 +0000
......
......@@ -9,7 +9,7 @@ Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/partman/partman-partitioning
Package: partman-partitioning
XC-Package-Type: udeb
Architecture: any
Depends: e2fsprogs-udeb, ${fs:Depends}, ${misc:Depends}
Depends: partman-base (>= 129), e2fsprogs-udeb, ${fs:Depends}, ${misc:Depends}
Description: Partitioning operations for partman
This udeb provides partman with editing operations for creation
of new partitions, deletion of partitions and initialisation of the
......
......@@ -145,16 +145,18 @@ create_new_partition () {
db_progress START 0 $numparts partman/text/please_wait
db_progress INFO partman-partitioning/new_state
if [ "$id" ] && [ -f ../../ext3 ]; then
db_get partman/default_filesystem
default_fs="$RET"
if [ "$id" ] && [ -f "../../$default_fs" ]; then
# make better defaults for the new partition
mkdir -p $id
echo format >$id/method
>$id/format
>$id/use_filesystem
echo ext3 >$id/filesystem
echo "$default_fs" >$id/filesystem
mkdir -p $id/options
if [ -f /lib/partman/mountoptions/ext3_defaults ]; then
for op in $(cat /lib/partman/mountoptions/ext3_defaults); do
if [ -f "/lib/partman/mountoptions/${default_fs}_defaults" ]; then
for op in $(cat "/lib/partman/mountoptions/${default_fs}_defaults"); do
echo "$op" >"$id/options/$op"
done
fi
......@@ -185,7 +187,7 @@ create_new_partition () {
if [ "$mp" ]; then
echo $mp >$id/mountpoint
fi
menudir_default_choice /lib/partman/active_partition ext3 mountpoint || true
menudir_default_choice /lib/partman/active_partition "$default_fs" mountpoint || true
menudir_default_choice /lib/partman/choose_partition partition_tree $dev//$id || true
# setting the bootable flag is too much unnecessary work:
# 1. check if the disk label supports bootable flag
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment