summaryrefslogtreecommitdiff
path: root/src/firstboot
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-11-24 15:40:24 +0100
committerLennart Poettering <lennart@poettering.net>2017-11-24 15:40:24 +0100
commit8700b4da0e6ff96068090e632d4369a86f526b0b (patch)
treea95989a37b2099b82e0ee0767246d6c2be38f5e6 /src/firstboot
parentdd202b88590910572b5f546d631e687f215a74b1 (diff)
downloadsystemd-8700b4da0e6ff96068090e632d4369a86f526b0b.tar.gz
firstboot: remove some unnecessary code (#7456)
Inspired by #7449.
Diffstat (limited to 'src/firstboot')
-rw-r--r--src/firstboot/firstboot.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 1435880fab..afbfa3743d 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -314,14 +314,8 @@ static int prompt_keymap(void) {
putchar('\n');
- r = prompt_loop("Please enter system keymap name or number", kmaps, keymap_is_valid, &arg_keymap);
- if (r < 0)
- return r;
-
- if (isempty(arg_keymap))
- return 0;
-
- return 0;
+ return prompt_loop("Please enter system keymap name or number",
+ kmaps, keymap_is_valid, &arg_keymap);
}
static int process_keymap(void) {