[Libosinfo] [PATCH v3 15/60] data: standard install script URI format
Daniel P. Berrange
berrange at redhat.com
Mon Oct 12 17:10:36 UTC 2015
Fix the URI format for install scripts to take the scheme
http://$domain-name/$distro/$script/$profile
where "$script" is the type of install script (ie kickstart,
preseed, unattend, etc) for the distro in question.
Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
data/install-scripts/debian.xml | 4 +--
data/install-scripts/fedora.xml | 4 +--
data/install-scripts/rhel.xml | 4 +--
data/install-scripts/ubuntu.xml | 2 +-
data/oses/centos.xml.in | 28 +++++++++----------
data/oses/debian.xml.in | 10 +++----
data/oses/fedora.xml.in | 62 ++++++++++++++++++++---------------------
data/oses/rhel.xml.in | 36 ++++++++++++------------
data/oses/ubuntu.xml.in | 16 +++++------
9 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml
index 3b054f1..770820f 100644
--- a/data/install-scripts/debian.xml
+++ b/data/install-scripts/debian.xml
@@ -1,6 +1,6 @@
<libosinfo version="0.0.1">
<!-- JEOS PROFILE -->
- <install-script id='http://debian.org/scripts/debian/jeos'>
+ <install-script id='http://debian.org/debian/preseed/jeos'>
<profile>jeos</profile>
<expected-filename>preseed.cfg</expected-filename>
<can-pre-install-drivers>true</can-pre-install-drivers>
@@ -127,7 +127,7 @@ d-i preseed/late_command string in-target passwd -d root
</install-script>
<!-- DESKTOP PROFILE -->
- <install-script id='http://debian.org/scripts/debian/desktop'>
+ <install-script id='http://debian.org/debian/preseed/desktop'>
<profile>desktop</profile>
<expected-filename>preseed.cfg</expected-filename>
<can-pre-install-drivers>true</can-pre-install-drivers>
diff --git a/data/install-scripts/fedora.xml b/data/install-scripts/fedora.xml
index 405b9c5..263d14a 100644
--- a/data/install-scripts/fedora.xml
+++ b/data/install-scripts/fedora.xml
@@ -1,6 +1,6 @@
<libosinfo version="0.0.1">
<!-- JEOS PROFILE -->
- <install-script id='http://fedoraproject.org/scripts/fedora/jeos'>
+ <install-script id='http://fedoraproject.org/fedora/kickstart/jeos'>
<profile>jeos</profile>
<expected-filename>fedora.ks</expected-filename>
<config>
@@ -156,7 +156,7 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-
</install-script>
<!-- DESKTOP PROFILE -->
- <install-script id='http://fedoraproject.org/scripts/fedora/desktop'>
+ <install-script id='http://fedoraproject.org/fedora/kickstart/desktop'>
<profile>desktop</profile>
<expected-filename>fedora.ks</expected-filename>
<config>
diff --git a/data/install-scripts/rhel.xml b/data/install-scripts/rhel.xml
index ddad117..33b0e68 100644
--- a/data/install-scripts/rhel.xml
+++ b/data/install-scripts/rhel.xml
@@ -1,6 +1,6 @@
<libosinfo version="0.0.1">
<!-- JEOS PROFILE -->
- <install-script id='http://redhat.com/scripts/rhel/jeos'>
+ <install-script id='http://redhat.com/rhel/kickstart/jeos'>
<profile>jeos</profile>
<expected-filename>rhel.ks</expected-filename>
<config>
@@ -105,7 +105,7 @@ reboot
</install-script>
<!-- DESKTOP PROFILE -->
- <install-script id='http://redhat.com/scripts/rhel/desktop'>
+ <install-script id='http://redhat.com/rhel/kickstart/desktop'>
<profile>desktop</profile>
<expected-filename>rhel.ks</expected-filename>
<config>
diff --git a/data/install-scripts/ubuntu.xml b/data/install-scripts/ubuntu.xml
index 478d104..5c47c09 100644
--- a/data/install-scripts/ubuntu.xml
+++ b/data/install-scripts/ubuntu.xml
@@ -1,6 +1,6 @@
<libosinfo version="0.0.1">
<!-- JEOS PROFILE -->
- <install-script id='http://ubuntu.com/scripts/ubuntu/jeos'>
+ <install-script id='http://ubuntu.com/ubuntu/preseed/jeos'>
<profile>jeos</profile>
<expected-filename>preseed.cfg</expected-filename>
<config>
diff --git a/data/oses/centos.xml.in b/data/oses/centos.xml.in
index 15d9895..85355e5 100644
--- a/data/oses/centos.xml.in
+++ b/data/oses/centos.xml.in
@@ -42,8 +42,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -88,8 +88,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -134,8 +134,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -188,8 +188,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -234,8 +234,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -280,8 +280,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -320,8 +320,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
index 1db371d..c24f37d 100644
--- a/data/oses/debian.xml.in
+++ b/data/oses/debian.xml.in
@@ -204,7 +204,7 @@
</media>
<installer>
- <script id='http://debian.org/scripts/debian/jeos'/>
+ <script id='http://debian.org/debian/preseed/jeos'/>
</installer>
</os>
@@ -255,8 +255,8 @@
</media>
<installer>
- <script id='http://debian.org/scripts/debian/jeos'/>
- <script id='http://debian.org/scripts/debian/desktop'/>
+ <script id='http://debian.org/debian/preseed/jeos'/>
+ <script id='http://debian.org/debian/preseed/desktop'/>
</installer>
</os>
@@ -307,8 +307,8 @@
</media>
<installer>
- <script id='http://debian.org/scripts/debian/jeos'/>
- <script id='http://debian.org/scripts/debian/desktop'/>
+ <script id='http://debian.org/debian/preseed/jeos'/>
+ <script id='http://debian.org/debian/preseed/desktop'/>
</installer>
</os>
diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
index c10eb39..48a0c18 100644
--- a/data/oses/fedora.xml.in
+++ b/data/oses/fedora.xml.in
@@ -86,7 +86,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -224,7 +224,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -362,7 +362,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -574,7 +574,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -796,7 +796,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -1038,7 +1038,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -1153,7 +1153,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -1280,7 +1280,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -1646,7 +1646,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -1998,7 +1998,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -2350,7 +2350,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -2662,7 +2662,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -2890,7 +2890,7 @@
</tree>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
</installer>
</os>
@@ -3131,8 +3131,8 @@
</resources>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
- <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
</installer>
</os>
@@ -3250,8 +3250,8 @@
</resources>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
- <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
</installer>
</os>
@@ -3369,8 +3369,8 @@
</resources>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
- <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
</installer>
</os>
@@ -3486,8 +3486,8 @@
</resources>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
- <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
</installer>
</os>
@@ -3603,8 +3603,8 @@
</resources>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
- <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
</installer>
</os>
@@ -3753,8 +3753,8 @@
</resources>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
- <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
</installer>
</os>
@@ -3893,8 +3893,8 @@
</resources>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
- <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
</installer>
</os>
@@ -4085,8 +4085,8 @@
</resources>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
- <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
</installer>
</os>
@@ -4251,8 +4251,8 @@
</resources>
<installer>
- <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
- <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
+ <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
</installer>
</os>
diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
index 3aa53dd..6cfc5da 100644
--- a/data/oses/rhel.xml.in
+++ b/data/oses/rhel.xml.in
@@ -793,8 +793,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -843,8 +843,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -893,8 +893,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -943,8 +943,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -993,8 +993,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -1043,8 +1043,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -1093,8 +1093,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -1175,8 +1175,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
@@ -1289,8 +1289,8 @@
</resources>
<installer>
- <script id='http://redhat.com/scripts/rhel/jeos'/>
- <script id='http://redhat.com/scripts/rhel/desktop'/>
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
</installer>
</os>
diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
index 6857e01..b2a19db 100644
--- a/data/oses/ubuntu.xml.in
+++ b/data/oses/ubuntu.xml.in
@@ -1124,7 +1124,7 @@
</media>
<installer>
- <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
</installer>
</os>
@@ -1190,7 +1190,7 @@
</media>
<installer>
- <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
</installer>
</os>
@@ -1256,7 +1256,7 @@
</media>
<installer>
- <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
</installer>
</os>
@@ -1322,7 +1322,7 @@
</media>
<installer>
- <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
</installer>
</os>
@@ -1389,7 +1389,7 @@
</media>
<installer>
- <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
</installer>
</os>
@@ -1456,7 +1456,7 @@
</media>
<installer>
- <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
</installer>
</os>
@@ -1523,7 +1523,7 @@
</media>
<installer>
- <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
</installer>
</os>
@@ -1590,7 +1590,7 @@
</media>
<installer>
- <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
</installer>
</os>
</libosinfo>
--
2.4.3
More information about the Libosinfo
mailing list