[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#269935: diff



This is a reversed diff for the change made in r19916. I think it will fix
the mount point change, but lack time to test it. The missing template would
also need to be put back or dealt with.

I don't understand how or why this change came to be made. It seems obviously
very broken to me from my limited knowledge of partman.

Index: choices
===================================================================
--- choices     (revision 19916)
+++ choices     (revision 19915)
@@ -24,9 +24,19 @@
 esac
 
 choice_mountpoint () {
-    db_metaget partman-basicfilesystems/text/options description
-    RET=$(stralign -25 "$RET")
-    printf "options\t%s%.45s\n" "$RET" "$(get_mountoptions $dev $id)"
+    case "$filesystem" in
+       reiserfs)
+           if [ -f $part/mountpoint ]; then
+               mp=$(cat $part/mountpoint)
+           else
+               db_metaget partman-basicfilesystems/text/no_mountpoint description
+               mp="$RET"
+           fi
+           db_metaget partman-reiserfs/text/specify_mountpoint description
+           RET=$(stralign -25 "$RET")
+           printf "mountpoint\t%s%s\n" "$RET" "$mp"
+           ;;
+    esac
 }
 
 choice_options () {

-- 
see shy jo

Attachment: signature.asc
Description: Digital signature


Reply to: