diff --git a/geninfo/genisolist.ini b/geninfo/genisolist.ini index af25cff..7a8a96c 100644 --- a/geninfo/genisolist.ini +++ b/geninfo/genisolist.ini @@ -10,11 +10,12 @@ [%main%] root = /data/ urlbase = / -d30 = Ubuntu -d40 = Ubuntu 衍生版 -d20 = Debian d10 = Arch Linux -d50 = Fedora +d20 = Debian +d25 = CentOS +d30 = Fedora +d40 = Ubuntu +d50 = Ubuntu 衍生版 d60 = Deepin # Sections whose name isn't "%main%" defined a detect rule of image detection. @@ -39,7 +40,7 @@ version = $1 type = CLI-only platform = $2 -[ubuntu] +[ubuntu desktop] distro = Ubuntu listvers = 4 # If one glob is not enough for locating all images, you can use "location_N" @@ -48,7 +49,19 @@ location_0 = ubuntu-releases/[a-z]*/ubuntu-*-desktop-i386.iso location_1 = ubuntu-releases/[a-z]*/ubuntu-*-desktop-amd64.iso pattern = ubuntu-([0-9.]+)-desktop-(\w+).iso version = $1 -type = LiveCD +type = Desktop LiveDVD +platform = $2 + +[ubuntu server] +distro = Ubuntu +listvers = 4 +# If one glob is not enough for locating all images, you can use "location_N" +# to specify more globs. N start from 0 and must a sequence (0,1,2...). +location_0 = ubuntu-releases/[a-z]*/ubuntu-*-server-i386.iso +location_1 = ubuntu-releases/[a-z]*/ubuntu-*-server-amd64.iso +pattern = ubuntu-([0-9.]+)-server-(\w+).iso +version = $1 +type = Server platform = $2 # You can apply multiple rules (sections) for the same distro like following @@ -133,7 +146,7 @@ platform = $2 distro = CentOS listvers = 2 location = centos/[0-9].*/isos/*/CentOS-[0-9]*.iso -pattern = CentOS-([0-9.]+)-(\w+)-([Mm]inimal|[Nn]et[Ii]nstall|Live\w+)(-[0-9]+|).iso +pattern = CentOS-([0-9.]+)-(\w+)-((bin-)?\w+?)(-[0-9]+|).iso version = $1 type = $3 platform = $2