[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 646d6b0670e2b56d007675ad2db1ac7670850382

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4107 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  646d6b0670e2b56d007675ad2db1ac7670850382 (commit)
       via  618b9f3a7650b9f9d41dd0b5b34bf0758146e410 (commit)
      from  faec72df5d9f18703bdcd5d655171558b671a4bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 646d6b0670e2b56d007675ad2db1ac7670850382
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 13 15:44:20 2021 +0000

    installer: Fix reading /proc/cmdline when launched by GRUB
    
    The installer was reading the kernel command line and was looking for
    certain values which configured the installer.
    
    GRUB appended a trailing newline character which was not accounted for
    and caused that the last parameter was not correctly compared to the
    list of possible keys.
    
    Fixes: #12656 - core 157: unattended installation don't work as expected on EFI
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 618b9f3a7650b9f9d41dd0b5b34bf0758146e410
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 13 10:11:31 2021 +0000

    aws: Enable serial console by default
    
    AWS for some time now has a serial console feature which is enabled by
    default on all systems. The VGA console is not enabled for any new
    non-x86 instance types and not interactive.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/system/partresize |  5 +++--
 src/installer/main.c              | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize
index 20044b083..4fa1906d0 100644
--- a/src/initscripts/system/partresize
+++ b/src/initscripts/system/partresize
@@ -45,8 +45,9 @@ case "${1}" in
 				esac
 			fi
 
-			# Enable the serial console on all systems on Azure and Google Compute Platform
-			if running_on_azure || running_on_gcp; then
+			# Enable the serial console on all systems on AWS EC2, Azure
+			# and Google Compute Platform
+			if running_on_ec2 || running_on_azure || running_on_gcp; then
 				scon="on"
 			fi
 
diff --git a/src/installer/main.c b/src/installer/main.c
index 00d172888..fd20a1f37 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -290,18 +290,23 @@ static struct config {
 	.language = DEFAULT_LANG,
 };
 
-static void parse_command_line(struct config* c) {
+static void parse_command_line(FILE* flog, struct config* c) {
 	char buffer[STRING_SIZE];
 	char cmdline[STRING_SIZE];
 
 	FILE* f = fopen("/proc/cmdline", "r");
-	if (!f)
+	if (!f) {
+		fprintf(flog, "Could not open /proc/cmdline: %m");
 		return;
+	}
 
 	int r = fread(&cmdline, 1, sizeof(cmdline) - 1, f);
 	if (r > 0) {
-		char* token = strtok(cmdline, " ");
+		// Remove the trailing newline
+		if (cmdline[r-1] == '\n')
+			cmdline[r-1] = '\0';
 
+		char* token = strtok(cmdline, " ");
 		while (token) {
 			strncpy(buffer, token, sizeof(buffer));
 			char* val = buffer;
@@ -403,7 +408,7 @@ int main(int argc, char *argv[]) {
 	snprintf(title, sizeof(title), "%s - %s", DISTRO_NAME, DISTRO_SLOGAN);
 
 	// Parse parameters from the kernel command line
-	parse_command_line(&config);
+	parse_command_line(flog, &config);
 
 	if (config.unattended) {
 		splashWindow(title, _("Warning: Unattended installation will start in 10 seconds..."), 10);


hooks/post-receive
--
IPFire 2.x development tree