On Wed, Jun 14, 2006 at 11:40:00AM +0200, Frans Pop wrote:
I also wonder if the templates asking for the VG name and showing this
error should not be "critical" as no default exists.
Is there any reason not to have all the questions and error messages as
critical? It is an interactive script after all without any sane
defaults so user input must be expected...so how about the attached
patch?
Re,
David
Index: debian/changelog
===================================================================
--- debian/changelog (revision 38096)
+++ debian/changelog (working copy)
@@ -2,8 +2,9 @@
* Lock/unlock partitions when added to/removed from a VG
* Fix template alignment
+ * Make the LVM questions and error messages critical
- -- David Härdeman <[EMAIL PROTECTED]> Wed, 14 Jun 2006 20:57:02 +0200
+ -- David Härdeman <[EMAIL PROTECTED]> Wed, 14 Jun 2006 21:23:37 +0200
partman-lvm (37) unstable; urgency=low
Index: choose_partition/lvm/do_option
===================================================================
--- choose_partition/lvm/do_option (revision 38096)
+++ choose_partition/lvm/do_option (working copy)
@@ -18,7 +18,7 @@
# make sure that lvm is available
if ! grep -q "[0-9] device-mapper$" /proc/misc ; then
db_set partman-lvm/nolvm "false"
- db_input high partman-lvm/nolvm
+ db_input critical partman-lvm/nolvm
db_go
exit 0
fi
@@ -32,7 +32,7 @@
for s in /lib/partman/commit.d/*; do
if [ -x $s ]; then
$s || {
- db_input high partman-lvm/commit_failed || true
+ db_input critical partman-lvm/commit_failed ||
true
db_go || true
for s in /lib/partman/init.d/*; do
if [ -x $s ]; then
@@ -49,7 +49,7 @@
if ! pv_create "$pv"; then
db_subst partman-lvm/pvcreate_error PV "$pv"
db_set partman-lvm/nolvm "false"
- db_input high partman-lvm/nolvm
+ db_input critical partman-lvm/nolvm
db_go
exit 0
fi
@@ -189,7 +189,7 @@
done
if [ -z "$pvs" ]; then
db_set partman-lvm/nopartitions "false"
- db_input high partman-lvm/nopartitions
+ db_input critical partman-lvm/nopartitions
db_go
return
fi
@@ -203,7 +203,7 @@
vg="$RET"
if [ -z "$vg" ]; then
db_set partman-lvm/vgcreate_nonamegiven "false"
- db_input high partman-lvm/vgcreate_nonamegiven
+ db_input critical partman-lvm/vgcreate_nonamegiven
db_go
return
fi
@@ -211,7 +211,7 @@
# Check whether the VG name is already in use
if vgs "$vg" > /dev/null 2>&1; then
db_set partman-lvm/vgcreate_nameused "false"
- db_input high partman-lvm/vgcreate_nameused
+ db_input critical partman-lvm/vgcreate_nameused
db_go
return
fi
@@ -219,7 +219,7 @@
# Check whether the VG name overlaps with an existing device
if [ -e "/dev/$vg" ]; then
db_set partman-lvm/vgcreate_devnameused "false"
- db_input high partman-lvm/vgcreate_devnameused
+ db_input critical partman-lvm/vgcreate_devnameused
db_go
return
fi
@@ -234,7 +234,7 @@
return
elif [ -z "$RET" ]; then
db_set partman-lvm/vgcreate_nosel "false"
- db_input high partman-lvm/vgcreate_nosel
+ db_input critical partman-lvm/vgcreate_nosel
db_go
return
fi
@@ -244,7 +244,7 @@
if ! vg_create "$vg" $pvs; then
db_subst partman-lvm/vgcreate_error VG "$vg"
db_set partman-lvm/vgcreate_error "false"
- db_input high partman-lvm/vgcreate_error
+ db_input critical partman-lvm/vgcreate_error
db_go
else
db_subst partman-lvm/text/in_use VG "$vg"
@@ -272,7 +272,7 @@
done
if [ -z "$vgs" ]; then
db_set partman-lvm/vgdelete_novg "false"
- db_input high partman-lvm/vgdelete_novg
+ db_input critical partman-lvm/vgdelete_novg
db_go
return
fi
@@ -297,7 +297,7 @@
pvs=$(vg_list_pvs "$vg")
if ! vg_delete "$vg"; then
db_set partman-lvm/vgdelete_error "false"
- db_input high partman-lvm/vgdelete_error
+ db_input critical partman-lvm/vgdelete_error
db_go
else
for pv in $pvs; do
@@ -323,7 +323,7 @@
done
if [ -z "$pvs" ]; then
db_set partman-lvm/nopartitions "false"
- db_input high partman-lvm/nopartitions
+ db_input critical partman-lvm/nopartitions
db_go
return
fi
@@ -341,7 +341,7 @@
done
if [ -z "$vgs" ]; then
db_set partman-lvm/vgextend_novg "false"
- db_input high partman-lvm/vgextend_novg
+ db_input critical partman-lvm/vgextend_novg
db_go
return
fi
@@ -363,7 +363,7 @@
db_get partman-lvm/vgextend_parts
if [ -z "$RET" ]; then
db_set partman-lvm/vgextend_nosel "false"
- db_input high partman-lvm/vgextend_nosel
+ db_input critical partman-lvm/vgextend_nosel
db_go
return
elif [ "$RET" = "false" ]; then
@@ -377,7 +377,7 @@
db_subst partman-lvm/vgextend_error PARTITION $pv
db_subst partman-lvm/vgextend_error VG $vg
db_set partman-lvm/vgextend_error "false"
- db_input high partman-lvm/vgextend_error
+ db_input critical partman-lvm/vgextend_error
db_go
return
else
@@ -406,7 +406,7 @@
done
if [ -z "$vgs" ]; then
db_set partman-lvm/vgreduce_novg "false"
- db_input high partman-lvm/vgreduce_novg
+ db_input critical partman-lvm/vgreduce_novg
db_go
return
fi
@@ -440,7 +440,7 @@
db_get partman-lvm/vgreduce_parts
if [ -z "$RET" ]; then
db_set partman-lvm/vgreduce_nosel "false"
- db_input high partman-lvm/vgreduce_nosel
+ db_input critical partman-lvm/vgreduce_nosel
db_go
return
elif [ "$RET" = "false" ]; then
@@ -455,7 +455,7 @@
if [ "$count" -eq "$PVS" ]; then
if ! vg_delete "$vg"; then
db_set partman-lvm/vgdelete_error "false"
- db_input high partman-lvm/vgdelete_error
+ db_input critical partman-lvm/vgdelete_error
db_go
fi
return
@@ -467,7 +467,7 @@
db_subst partman-lvm/vgreduce_error VG "$vg"
db_subst partman-lvm/vgreduce_error PARTITION "$pv"
db_set partman-lvm/vgreduce_error "false"
- db_input high partman-lvm/vgreduce_error
+ db_input critical partman-lvm/vgreduce_error
db_go
return
else
@@ -493,7 +493,7 @@
if [ -z "$vgs" ]; then
db_set partman-lvm/lvcreate_nofreevg "false"
- db_input high partman-lvm/lvcreate_nofreevg
+ db_input critical partman-lvm/lvcreate_nofreevg
db_go
return
fi
@@ -515,7 +515,7 @@
db_get partman-lvm/lvcreate_name
if [ -z "$RET" ]; then
db_set partman-lvm/lvcreate_nonamegiven "false"
- db_input high partman-lvm/lvcreate_nonamegiven
+ db_input critical partman-lvm/lvcreate_nonamegiven
db_go
return
fi
@@ -526,7 +526,7 @@
db_subst partman-lvm/lvcreate_exists LV "$lv"
db_subst partman-lvm/lvcreate_exists VG $vg
db_set partman-lvm/lvcreate_exists "false"
- db_input high partman-lvm/lvcreate_exists
+ db_input critical partman-lvm/lvcreate_exists
db_go
return
fi
@@ -556,7 +556,7 @@
db_subst partman-lvm/lvcreate_error LV $lv
db_subst partman-lvm/lvcreate_error SIZE $RET
db_set partman-lvm/lvcreate_error "false"
- db_input high partman-lvm/lvcreate_error
+ db_input critical partman-lvm/lvcreate_error
db_go
return
fi
@@ -582,7 +582,7 @@
if [ -z "$lvs" ]; then
db_set partman-lvm/lvdelete_nolv "false"
- db_input high partman-lvm/lvdelete_nolv
+ db_input critical partman-lvm/lvdelete_nolv
db_go
return
fi
@@ -601,7 +601,7 @@
db_subst partman-lvm/lvdelete_error VG $vg
db_subst partman-lvm/lvdelete_error LV $lv
db_set partman-lvm/lvdelete_error "false"
- db_input high partman-lvm/lvdelete_error
+ db_input critical partman-lvm/lvdelete_error
db_go
return
fi
