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

Bug #4537, clean up sles12 genimage output

Browse Source
This commit is contained in:
Casandra Qiu 2015-02-04 14:11:46 -05:00
parent ad782ec517
commit 7f90f85103
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-server/share/xcat/netboot/sles/compute.sles12.ppc64le.pkglist
View File

@ -1,9 +1,11 @@
aaa_base
bash
coreutils
keyutils
lvm2
nfs-kernel-server
openssl
dhcp-client
kernel-default
openssh
procps
psmisc
@ -30,5 +32,12 @@ mdadm
multipath-tools
gpg2
cifs-utils
open-lldp
fcoe-utils
which
util-linux-systemd
util-linux-systemd
plymouth-dracut
udev
kernel-default

8
xCAT-server/share/xcat/netboot/sles/compute.sles12.x86_64.pkglist
View File

@ -1,9 +1,11 @@
aaa_base
coreutils
bash
nfs-kernel-server
keyutils
lvm2
openssl
dhcp-client
kernel-default
openssh
procps
psmisc
@ -29,7 +31,11 @@ dmraid
mdadm
multipath-tools
gpg2
which
cifs-utils
open-lldp
fcoe-utils
kernel-firmware
util-linux-systemd
kernel-default

15
xCAT-server/share/xcat/netboot/sles/genimage
View File

@ -827,6 +827,10 @@ unless(-l "$rootimg_dir/var/lib/dhcpcd") {
mkpath "$rootimg_dir/var/lib/dhcpcd/";
system("touch $rootimg_dir/var/lib/dhcpcd/dhcpcd-$prinic.info");
}
#keyctl moved to /bin for newer release
system("cd $rootimg_dir/usr/bin/; ln -s ../../bin/keyctl $rootimg_dir/usr/bin/keyctl");
# which is different from the Redhat family
# some rpms mounts the imageroot/proc on the /proc, need to release it,
@ -1005,10 +1009,10 @@ sub mkinitrd_dracut {
#update etc/dracut.conf
open($DRACUTCONF, '>', "$rootimg_dir/etc/dracut.conf");
if (-d glob($dracutmoduledir."[0-9]*fadump")){
print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules fadump"\n};
print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules lvm fadump"\n};
}
else{
print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules"\n};
print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules lvm"\n};
}
print $DRACUTCONF qq{add_drivers+="$add_drivers"\n};
print $DRACUTCONF qq{filesystems+="nfs"\n};
@ -1043,10 +1047,10 @@ sub mkinitrd_dracut {
# update etc/dracut.conf
open($DRACUTCONF, '>', "$rootimg_dir/etc/dracut.conf");
if (-d glob($dracutmoduledir."[0-9]*fadump")){
print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules fadump"\n};
print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules lvm fadump"\n};
}
else{
print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules"\n};
print $DRACUTCONF qq{dracutmodules+="xcat nfs base network kernel-modules lvm"\n};
}
print $DRACUTCONF qq{add_drivers+="$add_drivers"\n};
close $DRACUTCONF;
@ -1992,7 +1996,8 @@ sub generic_post { # This function is meant to leave the image in a state approx
system("$cmd");
}
else {
print "[genimage] Not starting service $service, verify if started by systemctl\n";
$cmd = $cmd . "systemctl start $service.service";
system("$cmd");
}
}