arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For Ubuntu 14.04.2 LTS support, the linux-image-generic is called

Browse Source 
linux-image-generic-lts-utopic and in the genimage we search for
linux-image-generic pattern and replace with "linux-image-generic"
This causes problems when creating diskless images for Ubuntu 14.04.2

Also creating new pkglist files for diskful and diskless images
This commit is contained in:
Victor Hu 2015-02-20 13:43:29 -05:00
parent 733e2bc0cd
commit a632f3186c
9 changed files with 62 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-server/lib/xcat/plugins/genimage.pm
View File

@ -168,12 +168,24 @@ sub process_request {
return 1;
}
$pkglist = $ref_linuximage_tab->{'pkglist'};
if (! -e $pkglist) {
$callback->({error=>["The pkglist specified \'$pkglist\' does not exist!"],errorcode=>[1]});
return 1;
}
$srcdir = $ref_linuximage_tab->{'pkgdir'};
$srcdir_otherpkgs = $ref_linuximage_tab->{'otherpkgdir'};
$otherpkglist = $ref_linuximage_tab->{'otherpkglist'};
if (! -e $otherpkglist) {
$callback->({error=>["The otherpkglist specified \'$otherpkglist\' does not exist!"],errorcode=>[1]});
return 1;
}
$postinstall_filename = $ref_linuximage_tab->{'postinstall'};
if (! -e $postinstall_filename) {
$callback->({error=>["The postinstall_filename specified \'$postinstall_filename\' does not exist!"],errorcode=>[1]});
return 1;
}
$destdir = $ref_linuximage_tab->{'rootimgdir'};
$rootimg_dir = $ref_linuximage_tab->{'rootimgdir'};
$driverupdatesrc = $ref_linuximage_tab->{'driverupdatesrc'};

15
xCAT-server/share/xcat/install/ubuntu/compute.ubuntu14.04.2.ppc64el.pkglist Normal file
View File

@ -0,0 +1,15 @@
bash
nfs-common
openssl
isc-dhcp-client
libc-bin
linux-image-generic-lts-utopic
openssh-server
openssh-client
wget
vim
ntp
rsync
busybox-static
gawk
dnsutils

1
xCAT-server/share/xcat/install/ubuntu/compute.ubuntu14.04.2.ppc64le.pkglist Symbolic link
View File

@ -0,0 +1 @@
compute.ubuntu14.04.2.ppc64el.pkglist

15
xCAT-server/share/xcat/install/ubuntu/compute.ubuntu14.04.ppc64el.pkglist Normal file
View File

@ -0,0 +1,15 @@
bash
nfs-common
openssl
isc-dhcp-client
libc-bin
linux-image-generic
openssh-server
openssh-client
wget
vim
ntp
rsync
busybox-static
gawk
dnsutils

1
xCAT-server/share/xcat/install/ubuntu/compute.ubuntu14.04.ppc64le.pkglist Symbolic link
View File

@ -0,0 +1 @@
compute.ubuntu14.04.ppc64el.pkglist

15
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.2.ppc64el.pkglist Normal file
View File

@ -0,0 +1,15 @@
bash
nfs-common
openssl
isc-dhcp-client
libc-bin
linux-image-generic-lts-utopic
openssh-server
openssh-client
wget
vim
ntp
rsync
busybox-static
gawk
dnsutils

1
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.2.ppc64le.pkglist Symbolic link
View File

@ -0,0 +1 @@
compute.ubuntu14.04.2.ppc64el.pkglist

15
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.ppc64le.pkglist
View File

@ -1,15 +0,0 @@
bash
nfs-common
openssl
isc-dhcp-client
libc-bin
linux-image-generic
openssh-server
openssh-client
wget
vim
ntp
rsync
busybox-static
gawk
dnsutils

1
xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.ppc64le.pkglist Symbolic link
View File

@ -0,0 +1 @@
compute.ubuntu14.04.ppc64el.pkglist

2
xCAT-server/share/xcat/netboot/ubuntu/genimage
View File

@ -397,7 +397,7 @@ unless ($onlyinitrd) {
push @npa, $kernelname;
}
elsif ($p =~ /linux-image-generic/) {
$kernelimage = "linux-image-generic";
$kernelimage = $p;
}
elsif ($p =~ /^@/) {
push @npa, "\"$p\"";