|
|
|
@ -389,7 +389,6 @@ if [ "$skip_partitioning" != true ]; then |
|
|
|
# Partitioning |
|
|
|
# Partitioning |
|
|
|
|
|
|
|
|
|
|
|
EOF |
|
|
|
EOF |
|
|
|
|
|
|
|
|
|
|
|
if [ -n "$disk" ]; then |
|
|
|
if [ -n "$disk" ]; then |
|
|
|
echo "d-i partman-auto/disk string $disk" | $save_preseed |
|
|
|
echo "d-i partman-auto/disk string $disk" | $save_preseed |
|
|
|
fi |
|
|
|
fi |
|
|
|
@ -397,22 +396,13 @@ EOF |
|
|
|
echo "d-i partman-auto/method string $partitioning_method" | $save_preseed |
|
|
|
echo "d-i partman-auto/method string $partitioning_method" | $save_preseed |
|
|
|
|
|
|
|
|
|
|
|
if [ "$partitioning_method" = regular ]; then |
|
|
|
if [ "$partitioning_method" = regular ]; then |
|
|
|
|
|
|
|
|
|
|
|
[ "$gpt" = true ] && $save_preseed << 'EOF' |
|
|
|
[ "$gpt" = true ] && $save_preseed << 'EOF' |
|
|
|
d-i partman-partitioning/default_label string gpt |
|
|
|
d-i partman-partitioning/default_label string gpt |
|
|
|
EOF |
|
|
|
EOF |
|
|
|
|
|
|
|
|
|
|
|
echo "d-i partman/default_filesystem string $filesystem" | $save_preseed |
|
|
|
echo "d-i partman/default_filesystem string $filesystem" | $save_preseed |
|
|
|
|
|
|
|
|
|
|
|
if [ "$efi" = true ]; then |
|
|
|
|
|
|
|
$save_preseed << 'EOF' |
|
|
|
|
|
|
|
538 538 1075 free \ |
|
|
|
|
|
|
|
$iflabel{ gpt } \ |
|
|
|
|
|
|
|
$reusemethod{ } \ |
|
|
|
|
|
|
|
method{ efi } \ |
|
|
|
|
|
|
|
format{ } \ |
|
|
|
|
|
|
|
. \ |
|
|
|
|
|
|
|
EOF |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
$save_preseed << 'EOF' |
|
|
|
$save_preseed << 'EOF' |
|
|
|
d-i partman-auto/expert_recipe string \ |
|
|
|
d-i partman-auto/expert_recipe string \ |
|
|
|
naive :: \ |
|
|
|
naive :: \ |
|
|
|
@ -422,8 +412,14 @@ d-i partman-auto/expert_recipe string \ |
|
|
|
method{ biosgrub } \ |
|
|
|
method{ biosgrub } \ |
|
|
|
. \ |
|
|
|
. \ |
|
|
|
EOF |
|
|
|
EOF |
|
|
|
fi |
|
|
|
[ "$efi" = true ] && $save_preseed << 'EOF' |
|
|
|
|
|
|
|
538 538 1075 free \ |
|
|
|
|
|
|
|
$iflabel{ gpt } \ |
|
|
|
|
|
|
|
$reusemethod{ } \ |
|
|
|
|
|
|
|
method{ efi } \ |
|
|
|
|
|
|
|
format{ } \ |
|
|
|
|
|
|
|
. \ |
|
|
|
|
|
|
|
EOF |
|
|
|
$save_preseed << 'EOF' |
|
|
|
$save_preseed << 'EOF' |
|
|
|
2149 2150 -1 $default_filesystem \ |
|
|
|
2149 2150 -1 $default_filesystem \ |
|
|
|
method{ format } \ |
|
|
|
method{ format } \ |
|
|
|
|