Merge pull request #37 from Vertsineu/fix-ubuntu

fix(os/ubuntu): fix locations of ubuntu-cdimage rules

Author: Harry-Chen

includes/os/ubuntu.ini

@@ -10,7 +10,7 @@ platform = $2
 [ubuntu_preinstalled_desktop]
 distro = Ubuntu
 listvers = 4
-location = ubuntu-cdimage/releases/[a-z]*/release/ubuntu-*-preinstalled-desktop-*.img.xz
+location = ubuntu-cdimage/ubuntu/releases/[a-z]*/release/ubuntu-*-preinstalled-desktop-*.img.xz
 pattern = ubuntu-([0-9.]+)-preinstalled-desktop-(.+).img.xz
 version = $1
 type = Preinstalled Desktop
@@ -20,7 +20,7 @@ platform = $2
 distro = Ubuntu
 listvers = 4
 location_0 = ubuntu-releases/[a-z]*/ubuntu-*-live-server-*.iso
-location_1 = ubuntu-cdimage/releases/[a-z]*/release/ubuntu-*-live-server-*.iso
+location_1 = ubuntu-cdimage/ubuntu/releases/[a-z]*/release/ubuntu-*-live-server-*.iso
 pattern = ubuntu-([0-9.]+)-live-server-(.+).iso
 version = $1
 type = Server
@@ -29,7 +29,7 @@ platform = $2
 [ubuntu_preinstalled_server]
 distro = Ubuntu
 listvers = 4
-location = ubuntu-cdimage/releases/[a-z]*/release/ubuntu-*-preinstalled-server-*.img.xz
+location = ubuntu-cdimage/ubuntu/releases/[a-z]*/release/ubuntu-*-preinstalled-server-*.img.xz
 pattern = ubuntu-([0-9.]+)-preinstalled-server-(.+).img.xz
 version = $1
 type = Preinstalled Server
@@ -39,7 +39,7 @@ platform = $2
 distro = Ubuntu
 listvers = 4
 location_0 = ubuntu-releases/[a-z]*/ubuntu-*-server-*.iso
-location_1 = ubuntu-cdimage/releases/[a-z]*/release/ubuntu-*-server-*.iso
+location_1 = ubuntu-cdimage/ubuntu/releases/[a-z]*/release/ubuntu-*-server-*.iso
 pattern = ubuntu-([0-9.]+)-server-(\w+).iso
 version = $1
 type = Server