From lasse.schuirmann at gmail.com Fri Jul 4 07:15:41 2014 From: lasse.schuirmann at gmail.com (Lasse Schuirmann) Date: Fri, 4 Jul 2014 09:15:41 +0200 Subject: [Libosinfo] [PATCH 3/3] debian: Add desktop installation script In-Reply-To: References: <1403614360-28260-1-git-send-email-lasse.schuirmann@gmail.com> <1403782762-5703-1-git-send-email-lasse.schuirmann@gmail.com> <1403782762-5703-3-git-send-email-lasse.schuirmann@gmail.com> Message-ID: 2014-06-26 19:01 GMT+02:00 Zeeshan Ali (Khattak) : > On Thu, Jun 26, 2014 at 4:04 PM, Lasse Schuirmann > wrote: >> 2014-06-26 16:59 GMT+02:00 Zeeshan Ali (Khattak) : >>> On Thu, Jun 26, 2014 at 12:39 PM, Lasse Schuirmann >>> wrote: >>>> This script needs an internet connection because it seems not possible >>>> to install the desktop that is present on the ISO. >>>> >>>> Choosing the default desktop package always installs GNOME which is not >>>> always shipped with the ISO hence is fetched from the internet. >>>> --- >>> >>> Looks good but I think what Christophe was saying in this thread was >>> that it would be nice to have a URL to the debian bug about installer >>> choosing a desktop it doesn't ship. >> >> This is no bug. >> >> "You could simply mark the Desktop environment option. It will install >> the packages for Gnome (...)." >> From: https://wiki.debian.org/tasksel#Desktop_environment > > Didn't you say that there is a way to select the default desktop but > that always selects GNOME. If so, the bug is that selected default is > not shipped on the ISO. If I said this it was wrong. The documentation mentions the "desktop" tasks and states that Gnome is installed if you choose it, along with other things needed to get a full desktop environment. It took some time to find that in the documentation because it was a bit hidden. Documentation names this option the "Desktop environment option" and lists no similar option despite manual package selection. I'll better change the commit message to mirror that. Lasse From lasse.schuirmann at gmail.com Tue Jul 8 13:35:12 2014 From: lasse.schuirmann at gmail.com (Lasse Schuirmann) Date: Tue, 8 Jul 2014 15:35:12 +0200 Subject: [Libosinfo] [PATCH 1/4] debian: Add templates to JEOS script In-Reply-To: <1403782762-5703-1-git-send-email-lasse.schuirmann@gmail.com> References: <1403782762-5703-1-git-send-email-lasse.schuirmann@gmail.com> Message-ID: <1404826515-4180-1-git-send-email-lasse.schuirmann@gmail.com> This introduces default values so that no questions are asked if localization or target disk are not given or 'C'. --- data/install-scripts/debian.xml | 52 +++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml index c5c8592..e344bda 100644 --- a/data/install-scripts/debian.xml +++ b/data/install-scripts/debian.xml @@ -1,4 +1,5 @@ + jeos preseed.cfg @@ -8,6 +9,7 @@ + initrd - -- 2.0.1 From lasse.schuirmann at gmail.com Tue Jul 8 13:35:13 2014 From: lasse.schuirmann at gmail.com (Lasse Schuirmann) Date: Tue, 8 Jul 2014 15:35:13 +0200 Subject: [Libosinfo] [PATCH 2/4] debian: Fix JEOS installation script In-Reply-To: <1404826515-4180-1-git-send-email-lasse.schuirmann@gmail.com> References: <1403782762-5703-1-git-send-email-lasse.schuirmann@gmail.com> <1404826515-4180-1-git-send-email-lasse.schuirmann@gmail.com> Message-ID: <1404826515-4180-2-git-send-email-lasse.schuirmann@gmail.com> grub-installer does not accept the boot device unless given after a certain command. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666974 for more info. --- data/install-scripts/debian.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml index e344bda..e08b86b 100644 --- a/data/install-scripts/debian.xml +++ b/data/install-scripts/debian.xml @@ -89,8 +89,9 @@ d-i passwd/root-password-again password d-i apt-setup/security_host string d-i apt-setup/services-select multiselect -- 2.0.1 From lasse.schuirmann at gmail.com Tue Jul 8 13:35:14 2014 From: lasse.schuirmann at gmail.com (Lasse Schuirmann) Date: Tue, 8 Jul 2014 15:35:14 +0200 Subject: [Libosinfo] [PATCH 3/4] install-script: Add needs-internet param In-Reply-To: <1404826515-4180-1-git-send-email-lasse.schuirmann@gmail.com> References: <1403782762-5703-1-git-send-email-lasse.schuirmann@gmail.com> <1404826515-4180-1-git-send-email-lasse.schuirmann@gmail.com> Message-ID: <1404826515-4180-3-git-send-email-lasse.schuirmann@gmail.com> Add API to query install scripts whether they can work properly without an internet connection or not. --- data/schemas/libosinfo.rng | 5 +++++ osinfo/libosinfo.syms | 5 +++++ osinfo/osinfo_install_script.c | 17 +++++++++++++++++ osinfo/osinfo_install_script.h | 3 +++ osinfo/osinfo_loader.c | 1 + 5 files changed, 31 insertions(+) diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng index 4f4edac..e693674 100644 --- a/data/schemas/libosinfo.rng +++ b/data/schemas/libosinfo.rng @@ -597,6 +597,11 @@ + + + + + diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms index abcc8bb..86de581 100644 --- a/osinfo/libosinfo.syms +++ b/osinfo/libosinfo.syms @@ -500,6 +500,11 @@ LIBOSINFO_0.2.10 { osinfo_install_script_injection_method_get_type; } LIBOSINFO_0.2.9; + LIBOSINFO_0.2.11 { + global: + osinfo_install_script_get_needs_internet; + } LIBOSINFO_0.2.10; + /* Symbols in next release... LIBOSINFO_0.0.2 { diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c index fca1267..cc3eed2 100644 --- a/osinfo/osinfo_install_script.c +++ b/osinfo/osinfo_install_script.c @@ -1326,6 +1326,23 @@ unsigned int osinfo_install_script_get_injection_methods(OsinfoInstallScript *sc 0); } +/** + * osinfo_install_script_get_needs_internet: + * @script: the install script + * + * Some install scripts can not ensure that they work without an internet connection. + * + * Returns: TRUE if script needs an internet connection, FALSE otherwise + * internet connection. + */ +gboolean osinfo_install_script_get_needs_internet(OsinfoInstallScript *script) +{ + return osinfo_entity_get_param_value_boolean_with_default + (OSINFO_ENTITY(script), + OSINFO_INSTALL_SCRIPT_PROP_NEEDS_INTERNET, + FALSE); +} + /* * Local variables: diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h index d328a96..f8083b4 100644 --- a/osinfo/osinfo_install_script.h +++ b/osinfo/osinfo_install_script.h @@ -55,6 +55,7 @@ typedef struct _OsinfoInstallScriptPrivate OsinfoInstallScriptPrivate; #define OSINFO_INSTALL_SCRIPT_PROP_PATH_FORMAT "path-format" #define OSINFO_INSTALL_SCRIPT_PROP_CAN_PRE_INSTALL_DRIVERS "can-pre-install-drivers" #define OSINFO_INSTALL_SCRIPT_PROP_CAN_POST_INSTALL_DRIVERS "can-post-install-drivers" +#define OSINFO_INSTALL_SCRIPT_PROP_NEEDS_INTERNET "needs-internet" #define OSINFO_INSTALL_SCRIPT_PROP_PRE_INSTALL_DRIVERS_SIGNING_REQ "pre-install-drivers-signing-req" #define OSINFO_INSTALL_SCRIPT_PROP_POST_INSTALL_DRIVERS_SIGNING_REQ "post-install-drivers-signing-req" #define OSINFO_INSTALL_SCRIPT_PROP_INJECTION_METHOD "injection-method" @@ -220,6 +221,8 @@ int osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScri unsigned int osinfo_install_script_get_injection_methods(OsinfoInstallScript *script); +gboolean osinfo_install_script_get_needs_internet(OsinfoInstallScript *script); + #endif /* __OSINFO_INSTALL_SCRIPT_H__ */ /* * Local variables: diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index b8d6e45..845eda3 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -822,6 +822,7 @@ static void osinfo_loader_install_script(OsinfoLoader *loader, { OSINFO_INSTALL_SCRIPT_PROP_PRODUCT_KEY_FORMAT, G_TYPE_STRING }, { OSINFO_INSTALL_SCRIPT_PROP_PATH_FORMAT, G_TYPE_STRING }, { OSINFO_INSTALL_SCRIPT_PROP_EXPECTED_FILENAME, G_TYPE_STRING }, + { OSINFO_INSTALL_SCRIPT_PROP_NEEDS_INTERNET, G_TYPE_BOOLEAN }, { OSINFO_INSTALL_SCRIPT_PROP_CAN_PRE_INSTALL_DRIVERS, G_TYPE_BOOLEAN }, { OSINFO_INSTALL_SCRIPT_PROP_CAN_POST_INSTALL_DRIVERS, G_TYPE_BOOLEAN }, { OSINFO_INSTALL_SCRIPT_PROP_PRE_INSTALL_DRIVERS_SIGNING_REQ, G_TYPE_STRING }, -- 2.0.1 From lasse.schuirmann at gmail.com Tue Jul 8 13:35:15 2014 From: lasse.schuirmann at gmail.com (Lasse Schuirmann) Date: Tue, 8 Jul 2014 15:35:15 +0200 Subject: [Libosinfo] [PATCH 4/4] debian: Add desktop installation script In-Reply-To: <1404826515-4180-1-git-send-email-lasse.schuirmann@gmail.com> References: <1403782762-5703-1-git-send-email-lasse.schuirmann@gmail.com> <1404826515-4180-1-git-send-email-lasse.schuirmann@gmail.com> Message-ID: <1404826515-4180-4-git-send-email-lasse.schuirmann@gmail.com> This script needs an internet connection because it seems not possible to install the desktop that is present on the ISO. Choosing the 'desktop' package always installs GNOME which is not always shipped with the ISO hence is fetched from the internet. More info: https://wiki.debian.org/tasksel#Desktop_environment --- data/install-scripts/debian.xml | 174 ++++++++++++++++++++++++++++++++++++++++ data/oses/debian.xml.in | 1 + 2 files changed, 175 insertions(+) diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml index e08b86b..2d4c3bc 100644 --- a/data/install-scripts/debian.xml +++ b/data/install-scripts/debian.xml @@ -103,4 +103,178 @@ d-i finish-install/reboot_in_progress note + + + + desktop + preseed.cfg + true + + + + + + + + + + + + + + + + + + + initrd + true + + diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in index 1ecb2dd..dc97d81 100644 --- a/data/oses/debian.xml.in +++ b/data/oses/debian.xml.in @@ -256,6 +256,7 @@