diff -u uswsusp-0.8/debian/uswsusp.config uswsusp-0.8/debian/uswsusp.config --- uswsusp-0.8/debian/uswsusp.config +++ uswsusp-0.8/debian/uswsusp.config @@ -114,27 +114,27 @@ # it is a valid option non the less. To not remove their changes # we add it to the SWAPLIST, but not after we confirmed this is # what they want. -if [ -z "$SWAPDEFAULT" ]; then +#if [ -z "$SWAPDEFAULT" ]; then # This can be: # Offset is given, no sbin/swap-offset # Offset is given, USERSWAP:USEROFFSET not in /proc/swaps # No offset, USERSWAP not in /proc/swaps # db_input critical uswsusp/continue_without_swap || true # db_get uswsusp/continue_without_swap - if [ "$RET" = "true" ]; then +# if [ "$RET" = "true" ]; then SWAPLIST=${SWAPLIST}${KOMMA}${USERSWAP} ; SWAPDEFAULT=${USERSWAP} # db_fset uswsusp/continue_without_swap hit true - fi -fi + # fi +#fi # If we still do not have a SWAPLIST, something is wrong -if [ -z "$SWAPLIST" ]; then +#if [ -z "$SWAPLIST" ]; then # db_input critical uswsusp/no_swap || true # db_fset uswsusp/no_swap hit true # db_go || true - exit 0 -fi + # exit 0 +#fi #db_subst uswsusp/resume_device list $SWAPLIST #db_set uswsusp/resume_device $SWAPDEFAULT @@ -146,78 +146,78 @@ # Stetup questions according to priority -for I in $LOWQ; do +#for I in $LOWQ; do # db_input low uswsusp/$I || true -done +#done -for I in $MEDQ; do +#for I in $MEDQ; do # db_input medium uswsusp/$I || true -done +#done -for I in $HIGHQ; do +#for I in $HIGHQ; do # db_input high uswsusp/$I || true -done +#done # Ask questions #db_go || true # Only if they want encryption, ask the RSA question #db_get uswsusp/encrypt -if [ "$RET" = "false" ]; then +#if [ "$RET" = "false" ]; then # db_set uswsusp/create_RSA_key false -elif [ "$RET" = "true" ]; then +#elif [ "$RET" = "true" ]; then # First ask filename - while [ 1 ] ; do +# while [ 1 ] ; do # db_input low uswsusp/RSA_key_file || true # db_go || true # db_get uswsusp/RSA_key_file || true - KEYFILE=$RET +# KEYFILE=$RET - if [ -n "$KEYFILE" ]; then - break - fi +# if [ -n "$KEYFILE" ]; then +# break +# fi # db_reset uswsusp/RSA_key_file - done +# done # Then ask if we should generate it, default to yes if they don't have one yet - if [ -e "$KEYFILE" ]; then + # if [ -e "$KEYFILE" ]; then # db_set uswsusp/create_RSA_key false - else + # else # db_set uswsusp/create_RSA_key true - fi + # fi # db_input low uswsusp/create_RSA_key || true # db_go || true # If they want it created, ask nr bits and passphrase (twice) # db_get uswsusp/create_RSA_key - if [ "$RET" = "true" ]; then - while [ 1 ]; do + # if [ "$RET" = "true" ]; then +# while [ 1 ]; do # db_input low uswsusp/RSA_key_bits || true # db_go || true # db_get uswsusp/RSA_key_bits - if [ -z "$RET" ] || [ $RET -ge 1024 -a $RET -le 4096 ]; then - break; - fi +# if [ -z "$RET" ] || [ $RET -ge 1024 -a $RET -le 4096 ]; then +# break; +# fi # db_reset uswsusp/RSA_key_bits - done +# done - P1=A; P2=B; +# P1=A; P2=B; - while [ "$P1" != "$P2" ]; do +# while [ "$P1" != "$P2" ]; do # db_input critical uswsusp/RSA_passphrase || true # db_input critical uswsusp/RSA_passphrase_v || true # db_go || true # db_get uswsusp/RSA_passphrase - if [ -n "$RET" ]; then P1=$RET; fi +# if [ -n "$RET" ]; then P1=$RET; fi # db_get uswsusp/RSA_passphrase_v - if [ -n "$RET" ]; then P2=$RET; fi - done - fi -fi +# if [ -n "$RET" ]; then P2=$RET; fi +# done + # fi +#fi diff -u uswsusp-0.8/debian/changelog uswsusp-0.8/debian/changelog --- uswsusp-0.8/debian/changelog +++ uswsusp-0.8/debian/changelog @@ -1,4 +1,4 @@ -uswsusp (0.8-1.2yavdr5) lucid; urgency=low +uswsusp (0.8-1.2yavdr6) lucid; urgency=low * rem debconf