diff options
| author | Karel Zak | 2017-08-24 15:37:16 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-08-24 15:48:46 +0200 |
| commit | c1154128db5f2359d7825d048134ac262af10b6b (patch) | |
| tree | dd4bdcdb683cf78a9cfa4b4fe93f33bfe72a7c87 /tests/expected/sfdisk | |
| parent | fdisk: handle SIGINT in dialogs as cancel (diff) | |
| download | kernel-qcow2-util-linux-c1154128db5f2359d7825d048134ac262af10b6b.tar.gz kernel-qcow2-util-linux-c1154128db5f2359d7825d048134ac262af10b6b.tar.xz kernel-qcow2-util-linux-c1154128db5f2359d7825d048134ac262af10b6b.zip | |
fdisk: fix readline interaction with signals
The high-level readline API is crazy to use with signals. Fortunately
the library provides low-level rl_callback_* API. In this case we can
use poll() to wait for input and control all signals, etc.
This patch also a little changes fdisk behavior on CTRL+C and CTRL+D.
The signals does not kill fdisk, but forces fdisk to return to the
main menu, if already in the main menu then exit. If the disk layout
has been modified than ask "Do you really want to exit...".
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/expected/sfdisk')
| -rw-r--r-- | tests/expected/sfdisk/gpt-attrs | 2 | ||||
| -rw-r--r-- | tests/expected/sfdisk/gpt-attrs-guid | 2 | ||||
| -rw-r--r-- | tests/expected/sfdisk/gpt-attrs-space | 2 | ||||
| -rw-r--r-- | tests/expected/sfdisk/gpt-attrs-with-typo | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/expected/sfdisk/gpt-attrs b/tests/expected/sfdisk/gpt-attrs index 81e78d13d..1ba16195b 100644 --- a/tests/expected/sfdisk/gpt-attrs +++ b/tests/expected/sfdisk/gpt-attrs @@ -1107,4 +1107,4 @@ GPT Entries: offset = 1024, size = 16384 bytes. Expert command (m for help): -Expert command (m for help):
\ No newline at end of file +Expert command (m for help): diff --git a/tests/expected/sfdisk/gpt-attrs-guid b/tests/expected/sfdisk/gpt-attrs-guid index 28ae38d5d..3368fb75b 100644 --- a/tests/expected/sfdisk/gpt-attrs-guid +++ b/tests/expected/sfdisk/gpt-attrs-guid @@ -1107,4 +1107,4 @@ GPT Entries: offset = 1024, size = 16384 bytes. Expert command (m for help): -Expert command (m for help):
\ No newline at end of file +Expert command (m for help): diff --git a/tests/expected/sfdisk/gpt-attrs-space b/tests/expected/sfdisk/gpt-attrs-space index 81e78d13d..1ba16195b 100644 --- a/tests/expected/sfdisk/gpt-attrs-space +++ b/tests/expected/sfdisk/gpt-attrs-space @@ -1107,4 +1107,4 @@ GPT Entries: offset = 1024, size = 16384 bytes. Expert command (m for help): -Expert command (m for help):
\ No newline at end of file +Expert command (m for help): diff --git a/tests/expected/sfdisk/gpt-attrs-with-typo b/tests/expected/sfdisk/gpt-attrs-with-typo index 81e78d13d..1ba16195b 100644 --- a/tests/expected/sfdisk/gpt-attrs-with-typo +++ b/tests/expected/sfdisk/gpt-attrs-with-typo @@ -1107,4 +1107,4 @@ GPT Entries: offset = 1024, size = 16384 bytes. Expert command (m for help): -Expert command (m for help):
\ No newline at end of file +Expert command (m for help): |