From fidencio at redhat.com Sun Dec 1 02:47:55 2013 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Sun, 1 Dec 2013 03:47:55 +0100 Subject: [Libosinfo] [PATCH] opensuse: Add 13.1 information Message-ID: <1385866075-9898-1-git-send-email-fidencio@redhat.com> --- data/oses/opensuse.xml.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/data/oses/opensuse.xml.in b/data/oses/opensuse.xml.in index 53e7f78..c368d10 100644 --- a/data/oses/opensuse.xml.in +++ b/data/oses/opensuse.xml.in @@ -371,4 +371,51 @@ + + opensuse13.1 + <_name>openSUSE 13.1 + 13.1 + <_vendor>openSUSE + linux + opensuse + + + + + http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-DVD-i586.iso + + openSUSE-13.1-DVD + LINUX + SUSE LINUX GmbH + + boot/i386/loader/linux + boot/i386/loader/initrd + + + http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-DVD-x86_64.iso + + openSUSE-13.1-DVD-x86_64 + LINUX + SUSE LINUX GmbH + + boot/x86_64/loader/linux + boot/x86_64/loader/initrd + + + + + + 500000000 + 1 + 1073741824 + 3221225472 + + + 2400000000 + 2147483648 + 5368709120 + + + + -- 1.8.4.2 From fidencio at redhat.com Sun Dec 1 03:09:33 2013 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Sun, 1 Dec 2013 04:09:33 +0100 Subject: [Libosinfo] [PATCH 0/4] Add requires-initrd-injection API Message-ID: <1385867377-11844-1-git-send-email-fidencio@redhat.com> This series of patches provides an API to tell the applications that some OSes (debian and debian-based distros) requires the automated installation' files injected into the initrd file. The scripts files were tested by Giuseppe (I just rebased and adapt them to my changes). I'd like to know where could be a good place add an API, exactly as virt-install has, to initrd-inject. Fabiano Fid?ncio (3): debian: fix ISO's recogntion for debian7 install-scripts: Add requires-initrd-injection API ubuntu: Add jeos install-script (version >= 6.06) Giuseppe Scrivano (1): debian: add installer script data/install-scripts/Makefile.am | 2 + data/install-scripts/debian.xml | 63 ++++++++++++++++++ data/install-scripts/ubuntu.xml | 137 +++++++++++++++++++++++++++++++++++++++ data/oses/debian.xml.in | 16 ++++- data/oses/ubuntu.xml.in | 59 +++++++++++++++++ data/schemas/libosinfo.rng | 5 ++ osinfo/libosinfo.syms | 2 + osinfo/osinfo_install_script.c | 16 +++++ osinfo/osinfo_install_script.h | 3 + osinfo/osinfo_loader.c | 1 + 10 files changed, 302 insertions(+), 2 deletions(-) create mode 100644 data/install-scripts/debian.xml create mode 100644 data/install-scripts/ubuntu.xml -- 1.8.4.2 From fidencio at redhat.com Sun Dec 1 03:09:34 2013 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Sun, 1 Dec 2013 04:09:34 +0100 Subject: [Libosinfo] [PATCH 1/4] debian: fix ISO's recogntion for debian7 In-Reply-To: <1385867377-11844-1-git-send-email-fidencio@redhat.com> References: <1385867377-11844-1-git-send-email-fidencio@redhat.com> Message-ID: <1385867377-11844-2-git-send-email-fidencio@redhat.com> Debian 7 is using 7.\d.\d format of ISOs instead of the usual 7.0.\d --- data/oses/debian.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in index 02110f7..7009e99 100644 --- a/data/oses/debian.xml.in +++ b/data/oses/debian.xml.in @@ -235,7 +235,7 @@ http://cdimage.debian.org/debian-cd/7.0.0/i386/iso-dvd/debian-7.0.0-i386-DVD-1.iso - Debian 7.0.\d i386 1 + Debian 7.\d.\d i386 1 install.386/vmlinuz install.386/initrd.gz @@ -243,7 +243,7 @@ http://cdimage.debian.org/debian-cd/7.0.0/amd64/iso-dvd/debian-7.0.0-amd64-DVD-1.iso - Debian 7.0.\d amd64 1 + Debian 7.\d.\d amd64 1 install.amd/vmlinuz install.amd/initrd.gz -- 1.8.4.2 From fidencio at redhat.com Sun Dec 1 03:09:35 2013 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Sun, 1 Dec 2013 04:09:35 +0100 Subject: [Libosinfo] [PATCH 2/4] install-scripts: Add requires-initrd-injection API In-Reply-To: <1385867377-11844-1-git-send-email-fidencio@redhat.com> References: <1385867377-11844-1-git-send-email-fidencio@redhat.com> Message-ID: <1385867377-11844-3-git-send-email-fidencio@redhat.com> Some OSes, to provide unattended installation support, require the configuration file injection on its initrd. --- data/schemas/libosinfo.rng | 5 +++++ osinfo/libosinfo.syms | 2 ++ osinfo/osinfo_install_script.c | 16 ++++++++++++++++ osinfo/osinfo_install_script.h | 3 +++ osinfo/osinfo_loader.c | 1 + 5 files changed, 27 insertions(+) diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng index 0675217..9563fdc 100644 --- a/data/schemas/libosinfo.rng +++ b/data/schemas/libosinfo.rng @@ -616,6 +616,11 @@ + + + + + diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms index 637ad09..d388e35 100644 --- a/osinfo/libosinfo.syms +++ b/osinfo/libosinfo.syms @@ -459,6 +459,8 @@ LIBOSINFO_0.2.9 { osinfo_os_variantlist_get_type; osinfo_os_variantlist_new; + + osinfo_install_script_get_requires_initrd_injection; } LIBOSINFO_0.2.8; /* Symbols in next release... diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c index 7444c8d..81ab3c8 100644 --- a/osinfo/osinfo_install_script.c +++ b/osinfo/osinfo_install_script.c @@ -1309,6 +1309,22 @@ int osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScri OSINFO_DEVICE_DRIVER_SIGNING_REQ_NONE); } +/** + * osinfo_install_script_get_requires_initrd_injection: + * @script: the install script + * + * Whether install script should be injected into the initrd file to be used + * in the installion. This is needed for Debian/Ubuntu automated installation. + * + * Returns: TRUE if install script requires initrd injection, FALSE otherwise. + */ +gboolean osinfo_install_script_get_requires_initrd_injection(OsinfoInstallScript *script) +{ + return osinfo_entity_get_param_value_boolean + (OSINFO_ENTITY(script), + OSINFO_INSTALL_SCRIPT_PROP_REQUIRES_INITRD_INJECTION); +} + /* * Local variables: diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h index c39b786..9b57a33 100644 --- a/osinfo/osinfo_install_script.h +++ b/osinfo/osinfo_install_script.h @@ -57,6 +57,7 @@ typedef struct _OsinfoInstallScriptPrivate OsinfoInstallScriptPrivate; #define OSINFO_INSTALL_SCRIPT_PROP_CAN_POST_INSTALL_DRIVERS "can-post-install-drivers" #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_REQUIRES_INITRD_INJECTION "requires-initrd-injection" /* object */ struct _OsinfoInstallScript @@ -195,6 +196,8 @@ gboolean osinfo_install_script_get_can_post_install_drivers(OsinfoInstallScript int osinfo_install_script_get_pre_install_drivers_signing_req(OsinfoInstallScript *script); int osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScript *script); +gboolean osinfo_install_script_get_requires_initrd_injection (OsinfoInstallScript *script); + #endif /* __OSINFO_INSTALL_SCRIPT_H__ */ /* * Local variables: diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index e9ce8e1..a884913 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -773,6 +773,7 @@ static void osinfo_loader_install_script(OsinfoLoader *loader, { OSINFO_INSTALL_SCRIPT_PROP_CAN_POST_INSTALL_DRIVERS, G_TYPE_BOOLEAN }, { OSINFO_INSTALL_SCRIPT_PROP_PRE_INSTALL_DRIVERS_SIGNING_REQ, G_TYPE_STRING }, { OSINFO_INSTALL_SCRIPT_PROP_POST_INSTALL_DRIVERS_SIGNING_REQ, G_TYPE_STRING }, + { OSINFO_INSTALL_SCRIPT_PROP_REQUIRES_INITRD_INJECTION, G_TYPE_BOOLEAN }, { NULL, G_TYPE_INVALID } }; gchar *value = NULL; -- 1.8.4.2 From fidencio at redhat.com Sun Dec 1 03:09:36 2013 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Sun, 1 Dec 2013 04:09:36 +0100 Subject: [Libosinfo] [PATCH 3/4] debian: add installer script In-Reply-To: <1385867377-11844-1-git-send-email-fidencio@redhat.com> References: <1385867377-11844-1-git-send-email-fidencio@redhat.com> Message-ID: <1385867377-11844-4-git-send-email-fidencio@redhat.com> From: Giuseppe Scrivano Signed-off-by: Giuseppe Scrivano --- data/install-scripts/Makefile.am | 1 + data/install-scripts/debian.xml | 63 ++++++++++++++++++++++++++++++++++++++++ data/oses/debian.xml.in | 12 ++++++++ 3 files changed, 76 insertions(+) create mode 100644 data/install-scripts/debian.xml diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am index c310468..442c286 100644 --- a/data/install-scripts/Makefile.am +++ b/data/install-scripts/Makefile.am @@ -1,6 +1,7 @@ databasedir = $(pkgdatadir)/db/install-scripts/ database_DATA = \ + debian.xml \ fedora.xml \ rhel.xml \ windows-sif.xml \ diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml new file mode 100644 index 0000000..f9126b5 --- /dev/null +++ b/data/install-scripts/debian.xml @@ -0,0 +1,63 @@ + + + jeos + preseed.cfg + + + + + + + + + + + + diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in index 7009e99..236d6f8 100644 --- a/data/oses/debian.xml.in +++ b/data/oses/debian.xml.in @@ -136,6 +136,10 @@ 5368709120 + + +