]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
firstboot: remove some unnecessary code (#7456)
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 24 Nov 2017 14:40:24 +0000 (15:40 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 24 Nov 2017 14:40:24 +0000 (15:40 +0100)
Inspired by #7449.

src/firstboot/firstboot.c

index 1435880fab8e74e6b792bf3c3db92e70c9365485..afbfa3743d6453ee66b60e668ac5af21f8104f0e 100644 (file)
@@ -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) {