Commit b069da88 authored by Joey Hess's avatar Joey Hess

* Remove seen flag munging and fix reset call ordering to better support

    preseeding.

r20567
parent 9462ba5e
......@@ -15,7 +15,6 @@ open_dialog GET_FLAGS $id
old_flags=$(read_list)
close_dialog
db_fset partman-partitioning/set_flags seen false
db_set partman-partitioning/set_flags "$old_flags"
db_subst partman-partitioning/set_flags CHOICES "$valid_flags"
db_input high partman-partitioning/set_flags || true
......
......@@ -13,7 +13,6 @@ close_dialog
[ "$id" ] || exit 1
db_fset partman-partitioning/set_name seen false
db_set partman-partitioning/set_name "$old_name"
db_input critical partman-partitioning/set_name || true
db_go || exit 1
......
......@@ -8,7 +8,6 @@ id=$3
cd $dev
db_set partman-partitioning/confirm_copy 'false'
db_fset partman-partitioning/confirm_copy seen false
db_input high partman-partitioning/confirm_copy || true
db_go || exit 0
db_get partman-partitioning/confirm_copy
......@@ -22,7 +21,6 @@ ask_for_source () {
source_dev=''
source_id=''
while [ ! "$source_id" ]; do
db_fset partman-partitioning/source_partition seen false
choices=$(partition_tree_choices)
debconf_select critical partman-partitioning/source_partition "$choices" asdfasdfasdf
case $? in
......@@ -47,7 +45,6 @@ perform_copying () {
for s in /lib/partman/commit.d/*; do
if [ -x $s ]; then
$s || {
db_fset partman-partitioning/copy_commit_failed seen false
db_input high partman-partitioning/copy_commit_failed || true
db_go || true
for s in /lib/partman/init.d/*; do
......
......@@ -24,7 +24,6 @@ close_dialog
if [ "$virtual" = no ]; then
db_set partman-partitioning/confirm_resize 'false'
db_fset partman-partitioning/confirm_resize seen false
db_input critical partman-partitioning/confirm_resize || true
db_go || exit 0
db_get partman-partitioning/confirm_resize
......@@ -38,7 +37,6 @@ ask_for_size () {
newsize=''
while [ ! "$newsize" ]; do
db_set partman-partitioning/new_size "$hcursize"
db_fset partman-partitioning/new_size seen false
db_subst partman-partitioning/new_size MINSIZE "$hminsize"
db_subst partman-partitioning/new_size MAXSIZE "$hmaxsize"
db_subst partman-partitioning/new_size PERCENT "$minpercent%"
......@@ -64,16 +62,13 @@ ask_for_size () {
;;
esac
if [ -z "$newsize" ]; then
db_fset partman-partitioning/bad_new_size seen false
db_input high partman-partitioning/bad_new_size || true
db_go || true
elif ! longint_le "$newsize" "$maxsize"; then
db_fset partman-partitioning/big_new_size seen false
db_input high partman-partitioning/big_new_size || true
db_go || true
newsize=''
elif ! longint_le "$minsize" "$newsize"; then
db_fset partman-partitioning/small_new_size seen false
db_input high partman-partitioning/small_new_size || true
db_go || true
newsize=''
......@@ -89,7 +84,6 @@ perform_resizing () {
for s in /lib/partman/commit.d/*; do
if [ -x $s ]; then
$s || {
db_fset partman-partitioning/new_size_commit_failed seen false
db_input high partman-partitioning/new_size_commit_failed || true
db_go || true
for s in /lib/partman/init.d/*; do
......
partman-partitioning (27) UNRELEASED; urgency=low
* Remove seen flag munging and fix reset call ordering to better support
preseeding.
-- Joey Hess <joeyh@debian.org> Wed, 1 Sep 2004 16:20:37 -0400
partman-partitioning (26) unstable; urgency=low
* Joey Hess
......
......@@ -24,7 +24,6 @@ ask_for_size () {
size=''
while [ ! "$size" ]; do
db_set partman-partitioning/new_partition_size "$freehsize"
db_fset partman-partitioning/new_partition_size seen false
db_subst partman-partitioning/new_partition_size MAXSIZE "$freehsize"
db_input high partman-partitioning/new_partition_size ||
$noninteractive
......@@ -58,7 +57,6 @@ ask_for_size () {
esac
if [ -z "$size" ]; then
db_fset partman-partitioning/bad_new_partition_size seen false
db_input high partman-partitioning/bad_new_partition_size || true
db_go || true
fi
......@@ -91,7 +89,6 @@ ask_for_type () {
type=Logical
;;
pri/log)
db_fset partman-partitioning/new_partition_type seen false
if [ "$has_extended" = yes ]; then
db_set partman-partitioning/new_partition_type Logical
else
......@@ -116,7 +113,6 @@ ask_for_place () {
$noninteractive
place=full
else
db_fset partman-partitioning/new_partition_place seen false
db_input high partman-partitioning/new_partition_place ||
$noninteractive
db_go || return 1
......
......@@ -5,19 +5,19 @@
dev="$2"
cd $dev
db_reset partman/confirm_new_label
db_input high partman/confirm_new_label
db_go || exit 0
db_get partman/confirm_new_label
if [ "$RET" = false ]; then
db_reset partman/confirm_new_label
exit 1
fi
db_reset partman/confirm_new_label
open_dialog LABEL_TYPES
types=$(read_list)
close_dialog
db_fset partman-partitioning/choose_label seen false
db_subst partman-partitioning/choose_label CHOICES "$types"
PRIORITY=high
default_label=$(default_disk_label)
......@@ -32,13 +32,14 @@ db_get partman-partitioning/choose_label
chosen_type="$RET"
if [ "$chosen_type" = sun ]; then
db_reset partman/confirm_write_new_label
db_input high partman/confirm_write_new_label
db_go || exit 0
db_get partman/confirm_write_new_label
if [ "$RET" = false ]; then
db_reset partman/confirm_write_new_label
exit 1
fi
db_reset partman/confirm_write_new_label
fi
open_dialog NEW_LABEL "$chosen_type"
......
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