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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 7675 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  fb76fc5144d9b072cace93c008da90aa4ccfcbfa (commit)
       via  f754146b1eee3f7a78424959633680f593f36d92 (commit)
      from  7ef43add025bd53142cb31c17240e1b3b031115b (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 fb76fc5144d9b072cace93c008da90aa4ccfcbfa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Oct 12 15:50:31 2017 +0100

    installer: Fix detection if we have the correct ISO image mounted
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f754146b1eee3f7a78424959633680f593f36d92
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Oct 12 15:32:21 2017 +0100

    installer: Allow download of ISO images over HTTPS
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 lfs/installer                               |  1 +
 src/installer/configure.ac                  | 16 +++++++++++++---
 src/installer/dracut-module/module-setup.sh |  3 +++
 src/installer/hw.c                          |  2 +-
 src/installer/hw.h                          |  4 ++--
 src/installer/main.c                        | 10 +++++-----
 6 files changed, 25 insertions(+), 11 deletions(-)

Difference in files:
diff --git a/lfs/installer b/lfs/installer
index 347d90e..790ac06 100644
--- a/lfs/installer
+++ b/lfs/installer
@@ -59,6 +59,7 @@ $(TARGET) :
 		--with-distro-name="$(NAME)" \
 		--with-distro-sname="$(SNAME)" \
 		--with-distro-slogan="$(SLOGAN)" \
+		--with-distro-version="$(VERSION)-core$(CORE)" \
 		--with-config-root="$(CONFIG_ROOT)" \
 		--with-download-url="$(DOWNLOAD_URL)"
 
diff --git a/src/installer/configure.ac b/src/installer/configure.ac
index 85c5c5c..fb4858c 100644
--- a/src/installer/configure.ac
+++ b/src/installer/configure.ac
@@ -76,17 +76,22 @@ PKG_CHECK_MODULES(UDEV, [libudev])
 
 AC_ARG_WITH([distro-name],
 	AS_HELP_STRING([--with-distro-name] [The name of the distribution]),
-	AC_DEFINE_UNQUOTED([NAME], "$withval", [The name of the distribution]),
+	AC_DEFINE_UNQUOTED([DISTRO_NAME], "$withval", [The name of the distribution]),
 	AC_MSG_ERROR([*** you need to set the name with --with-distro-name=]))
 
 AC_ARG_WITH([distro-sname],
 	AS_HELP_STRING([--with-distro-sname] [The short name of the distribution]),
-	AC_DEFINE_UNQUOTED([SNAME], "$withval", [The sname of the distribution]),
+	AC_DEFINE_UNQUOTED([DISTRO_SNAME], "$withval", [The sname of the distribution]),
 	AC_MSG_ERROR([*** you need to set the sname with --with-distro-sname=]))
 
+AC_ARG_WITH([distro-version],
+	AS_HELP_STRING([--with-distro-sname] [The version of the distribution]),
+	AC_DEFINE_UNQUOTED([DISTRO_VERSION], "$withval", [The version of the distribution]),
+	AC_MSG_ERROR([*** you need to set the version with --with-distro-version=]))
+
 AC_ARG_WITH([distro-slogan],
 	AS_HELP_STRING([--with-distro-slogan] [The slogan of the distribution]),
-	AC_DEFINE_UNQUOTED([SLOGAN], "$withval", [The slogan of the distribution]),
+	AC_DEFINE_UNQUOTED([DISTRO_SLOGAN], "$withval", [The slogan of the distribution]),
 	AC_MSG_ERROR([*** you need to set the slogan with --with-distro-slogan=]))
 
 AC_ARG_WITH([config-root],
@@ -111,4 +116,9 @@ AC_MSG_RESULT([
 	CFLAGS:			${OUR_CFLAGS} ${CFLAGS}
 	CPPFLAGS:		${OUR_CPPFLAGS} ${CPPFLAGS}
 	LDFLAGS:		${OUR_LDFLAGS} ${LDFLAGS}
+
+	Distribution:		${DISTRO_NAME} (${DISTRO_SNAME})
+	Version:		${DISTRO_VERSION}
+	Slogan:			${DISTRO_SLOGAN}
+	Config Root:		${CONFIG_ROOT}
 ])
diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh
index 08dcdd5..b880397 100755
--- a/src/installer/dracut-module/module-setup.sh
+++ b/src/installer/dracut-module/module-setup.sh
@@ -42,6 +42,9 @@ install() {
     inst /var/ipfire/dhcpc/dhcpcd-run-hooks
     inst "$moddir/70-dhcpcd.exe" "/var/ipfire/dhcpc/dhcpcd-hooks/70-dhcpcd.exe"
 
+    # CAs
+    inst /etc/ssl/cert.pem
+
     inst /etc/host.conf /etc/protocols
     inst /etc/nsswitch.conf /etc/resolv.conf
     inst_libdir_file "libnss_dns.so.*"
diff --git a/src/installer/hw.c b/src/installer/hw.c
index 362be47..06bf42b 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -165,7 +165,7 @@ static int hw_test_source_medium(const char* path) {
 	// Umount the test device.
 	hw_umount(SOURCE_MOUNT_PATH);
 
-	return (ret == 0);
+	return ret;
 }
 
 char* hw_find_source_medium(struct hw* hw) {
diff --git a/src/installer/hw.h b/src/installer/hw.h
index f16b39c..e2d621b 100644
--- a/src/installer/hw.h
+++ b/src/installer/hw.h
@@ -24,8 +24,8 @@
 #include <libudev.h>
 
 #define DESTINATION_MOUNT_PATH        "/harddisk"
-#define SOURCE_MOUNT_PATH "/cdrom"
-#define SOURCE_TEST_FILE  SOURCE_MOUNT_PATH "/" VERSION ".media"
+#define SOURCE_MOUNT_PATH             "/cdrom"
+#define SOURCE_TEST_FILE              SOURCE_MOUNT_PATH "/" DISTRO_SNAME "-" DISTRO_VERSION ".media"
 
 #define HW_MAX_DISKS                 32
 #define STRING_SIZE                1024
diff --git a/src/installer/main.c b/src/installer/main.c
index c420de3..e9517e2 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -195,7 +195,7 @@ int write_lang_configs(char* lang) {
 
 	/* default stuff for main/settings. */
 	replacekeyvalue(kv, "LANGUAGE", lang);
-	replacekeyvalue(kv, "HOSTNAME", SNAME);
+	replacekeyvalue(kv, "HOSTNAME", DISTRO_SNAME);
 	replacekeyvalue(kv, "THEME", "ipfire");
 	writekeyvalues(kv, "/harddisk" CONFIG_ROOT "/main/settings");
 	freekeyvalues(kv);
@@ -369,7 +369,7 @@ int main(int argc, char *argv[]) {
 	FILE *copying;
 
 	setlocale(LC_ALL, "");
-	sethostname(SNAME, 10);
+	sethostname(DISTRO_SNAME, 10);
 
 	/* Log file/terminal stuff. */
 	FILE* flog = NULL;
@@ -398,7 +398,7 @@ int main(int argc, char *argv[]) {
 	if (roottext)
 		newtDrawRootText(0, 0, roottext);
 
-	snprintf(title, sizeof(title), "%s - %s", NAME, SLOGAN);
+	snprintf(title, sizeof(title), "%s - %s", DISTRO_NAME, DISTRO_SLOGAN);
 
 	// Parse parameters from the kernel command line
 	parse_command_line(&config);
@@ -448,7 +448,7 @@ int main(int argc, char *argv[]) {
 	if (!config.unattended) {
 		snprintf(message, sizeof(message),
 			_("Welcome to the %s installation program.\n\n"
-			"Selecting Cancel on any of the following screens will reboot the computer."), NAME);
+			"Selecting Cancel on any of the following screens will reboot the computer."), DISTRO_NAME);
 		newtWinMessage(title, _("Start installation"), message);
 	}
 
@@ -933,7 +933,7 @@ int main(int argc, char *argv[]) {
 			"Please remove any installation mediums from this system and hit the reboot button. "
 			"Once the system has restarted you will be asked to setup networking and system passwords. "
 			"After that, you should point your web browser at https://%s:444 (or what ever you name "
-			"your %s) for the web configuration console."), NAME, SNAME, NAME);
+			"your %s) for the web configuration console."), DISTRO_NAME, DISTRO_SNAME, DISTRO_NAME);
 		newtWinMessage(_("Congratulations!"), _("Reboot"), message);
 	}
 


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