diff --git a/xCAT-server/share/xcat/netboot/rh/compute.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.ppc64.postinstall index 30e571e51..5fbd8e26a 100755 --- a/xCAT-server/share/xcat/netboot/rh/compute.ppc64.postinstall +++ b/xCAT-server/share/xcat/netboot/rh/compute.ppc64.postinstall @@ -21,14 +21,14 @@ profile=$4 workdir=$5 #-- Example how /etc/fstab can be automatically generated during image generation: -cat <$installroot/etc/fstab -proc /proc proc rw 0 0 -sysfs /sys sysfs rw 0 0 -devpts /dev/pts devpts rw,gid=5,mode=620 0 0 -${profile}_${arch} / tmpfs rw 0 1 -none /tmp tmpfs defaults,size=10m 0 2 -none /var/tmp tmpfs defaults,size=10m 0 2 -END +#cat <$installroot/etc/fstab +#proc /proc proc rw 0 0 +#sysfs /sys sysfs rw 0 0 +#devpts /dev/pts devpts rw,gid=5,mode=620 0 0 +#${profile}_${arch} / tmpfs rw 0 1 +#none /tmp tmpfs defaults,size=10m 0 2 +#none /var/tmp tmpfs defaults,size=10m 0 2 +#END #-- Uncomment the line contains "cons" in /etc/inittab #cons:12345:respawn:/sbin/smart_agetty -L 38400 console diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall index 30e571e51..5fbd8e26a 100755 --- a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall +++ b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall @@ -21,14 +21,14 @@ profile=$4 workdir=$5 #-- Example how /etc/fstab can be automatically generated during image generation: -cat <$installroot/etc/fstab -proc /proc proc rw 0 0 -sysfs /sys sysfs rw 0 0 -devpts /dev/pts devpts rw,gid=5,mode=620 0 0 -${profile}_${arch} / tmpfs rw 0 1 -none /tmp tmpfs defaults,size=10m 0 2 -none /var/tmp tmpfs defaults,size=10m 0 2 -END +#cat <$installroot/etc/fstab +#proc /proc proc rw 0 0 +#sysfs /sys sysfs rw 0 0 +#devpts /dev/pts devpts rw,gid=5,mode=620 0 0 +#${profile}_${arch} / tmpfs rw 0 1 +#none /tmp tmpfs defaults,size=10m 0 2 +#none /var/tmp tmpfs defaults,size=10m 0 2 +#END #-- Uncomment the line contains "cons" in /etc/inittab #cons:12345:respawn:/sbin/smart_agetty -L 38400 console diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels5.3.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels5.3.ppc64.postinstall index 30e571e51..5fbd8e26a 100755 --- a/xCAT-server/share/xcat/netboot/rh/compute.rhels5.3.ppc64.postinstall +++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels5.3.ppc64.postinstall @@ -21,14 +21,14 @@ profile=$4 workdir=$5 #-- Example how /etc/fstab can be automatically generated during image generation: -cat <$installroot/etc/fstab -proc /proc proc rw 0 0 -sysfs /sys sysfs rw 0 0 -devpts /dev/pts devpts rw,gid=5,mode=620 0 0 -${profile}_${arch} / tmpfs rw 0 1 -none /tmp tmpfs defaults,size=10m 0 2 -none /var/tmp tmpfs defaults,size=10m 0 2 -END +#cat <$installroot/etc/fstab +#proc /proc proc rw 0 0 +#sysfs /sys sysfs rw 0 0 +#devpts /dev/pts devpts rw,gid=5,mode=620 0 0 +#${profile}_${arch} / tmpfs rw 0 1 +#none /tmp tmpfs defaults,size=10m 0 2 +#none /var/tmp tmpfs defaults,size=10m 0 2 +#END #-- Uncomment the line contains "cons" in /etc/inittab #cons:12345:respawn:/sbin/smart_agetty -L 38400 console diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.pkglist new file mode 100644 index 000000000..927dd6e36 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.pkglist @@ -0,0 +1,14 @@ +bash +dracut-network +nfs-utils +openssl +dhclient +kernel +openssh-server +openssh-clients +wget +vim-minimal +ntp +rpm +rsync +rsyslog diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist new file mode 100644 index 000000000..5255dbd3d --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist @@ -0,0 +1,20 @@ +bash +nfs-utils +openssl +dhclient +kernel +openssh-server +openssh-clients +busybox +wget +rsyslog +dash +vim-minimal +ntp +rsyslog +rpm +rsync +ppc64-utils +iputils +dracut +dracut-network diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall new file mode 100755 index 000000000..5fbd8e26a --- /dev/null +++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall @@ -0,0 +1,45 @@ +#!/bin/sh +#-- Do not remove following line if you want to make use of CVS version tracking +#-- $Id: compute.postinstall,v 1.21 2008/09/04 12:05:45 sikorsky Exp $ +#-- jurij.sikorsky@t-systems.cz +#-- +#-- this script is run after all packages from $profile.pkglist are installed +#-- +#-- it gets these arguments: +#-- +#-- $1 = install root (chroot directory for profile) +#-- $2 = OS version +#-- $3 = architecture +#-- $4 = profile name +#-- $5 = work dir (where genimage is located) +#-- +#-- +installroot=$1 +osver=$2 +arch=$3 +profile=$4 +workdir=$5 + +#-- Example how /etc/fstab can be automatically generated during image generation: +#cat <$installroot/etc/fstab +#proc /proc proc rw 0 0 +#sysfs /sys sysfs rw 0 0 +#devpts /dev/pts devpts rw,gid=5,mode=620 0 0 +#${profile}_${arch} / tmpfs rw 0 1 +#none /tmp tmpfs defaults,size=10m 0 2 +#none /var/tmp tmpfs defaults,size=10m 0 2 +#END + +#-- Uncomment the line contains "cons" in /etc/inittab +#cons:12345:respawn:/sbin/smart_agetty -L 38400 console +echo "co:2345:respawn:/sbin/agetty -L 38400 console" >> $installroot/etc/inittab + + +#-- Example of booted image versioning +#-- We want to know, with what configuration (version of the image) each node was booted. +#-- Hence, we keep image definition files and postscripts in CVS. During image generation we create file /etc/IMGVERSION and fill it with CVS "$Id$" of files with image definition (.pkglist, .exlist, .repolist, .postinstall). Then, during boot, each "CVS enabled" postscript (see /install/postscripts/cvs_template.sh and /install/postscripts/cvs_template.pl) adds one line to /etc/IMGVERSION. Then you can determine in any time what image you are running and what postscipts in which versions were run. +#cat /dev/null > $installroot/etc/IMGVERSION +#for ext in pkglist exlist postinstall repolist; do +# [ -r $workdir/$profile.$ext ] && cat $workdir/$profile.$ext | grep -E '^[[:space:]]*#.*[[:space:]]\$Id' >> $installroot/etc/IMGVERSION +#done + diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage index 0f202f48a..0194a82f6 100755 --- a/xCAT-server/share/xcat/netboot/rh/genimage +++ b/xCAT-server/share/xcat/netboot/rh/genimage @@ -1241,9 +1241,16 @@ sub generic_post { #This function is meant to leave the image in a state approxi print $cfgfile "proc /proc proc defaults 0 0\n"; print $cfgfile "sysfs /sys sysfs defaults 0 0\n"; if ($tmplimit) { - print $cfgfile "tmpfs /tmp tmpfs defaults 0 0\n"; - print $cfgfile "tmpfs /var/tmp tmpfs defaults 0 0\n"; + print $cfgfile "tmpfs /tmp tmpfs defaults,size=$tmplimit 0 2\n"; + print $cfgfile "tmpfs /var/tmp tmpfs defaults,size=$tmplimit 0 2\n"; } + if ($mode ne "statelite") { + my $rootfs_name=$profile."_".$arch; + print $cfgfile "$rootfs_name / tmpfs rw 0 1\n"; + } else { + print $cfgfile "sunrpc /var/lib/nfs/rpc_pipefs rpc_pipefs rw 0 0\n"; + } + close($cfgfile); open($cfgfile,">","$rootimg_dir/etc/sysconfig/network"); print $cfgfile "NETWORKING=yes\n"; diff --git a/xCAT-server/share/xcat/netboot/rh/service.postinstall b/xCAT-server/share/xcat/netboot/rh/service.postinstall index 30e571e51..5fbd8e26a 100755 --- a/xCAT-server/share/xcat/netboot/rh/service.postinstall +++ b/xCAT-server/share/xcat/netboot/rh/service.postinstall @@ -21,14 +21,14 @@ profile=$4 workdir=$5 #-- Example how /etc/fstab can be automatically generated during image generation: -cat <$installroot/etc/fstab -proc /proc proc rw 0 0 -sysfs /sys sysfs rw 0 0 -devpts /dev/pts devpts rw,gid=5,mode=620 0 0 -${profile}_${arch} / tmpfs rw 0 1 -none /tmp tmpfs defaults,size=10m 0 2 -none /var/tmp tmpfs defaults,size=10m 0 2 -END +#cat <$installroot/etc/fstab +#proc /proc proc rw 0 0 +#sysfs /sys sysfs rw 0 0 +#devpts /dev/pts devpts rw,gid=5,mode=620 0 0 +#${profile}_${arch} / tmpfs rw 0 1 +#none /tmp tmpfs defaults,size=10m 0 2 +#none /var/tmp tmpfs defaults,size=10m 0 2 +#END #-- Uncomment the line contains "cons" in /etc/inittab #cons:12345:respawn:/sbin/smart_agetty -L 38400 console diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels5.3.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/service.rhels5.3.ppc64.postinstall index 30e571e51..5fbd8e26a 100755 --- a/xCAT-server/share/xcat/netboot/rh/service.rhels5.3.ppc64.postinstall +++ b/xCAT-server/share/xcat/netboot/rh/service.rhels5.3.ppc64.postinstall @@ -21,14 +21,14 @@ profile=$4 workdir=$5 #-- Example how /etc/fstab can be automatically generated during image generation: -cat <$installroot/etc/fstab -proc /proc proc rw 0 0 -sysfs /sys sysfs rw 0 0 -devpts /dev/pts devpts rw,gid=5,mode=620 0 0 -${profile}_${arch} / tmpfs rw 0 1 -none /tmp tmpfs defaults,size=10m 0 2 -none /var/tmp tmpfs defaults,size=10m 0 2 -END +#cat <$installroot/etc/fstab +#proc /proc proc rw 0 0 +#sysfs /sys sysfs rw 0 0 +#devpts /dev/pts devpts rw,gid=5,mode=620 0 0 +#${profile}_${arch} / tmpfs rw 0 1 +#none /tmp tmpfs defaults,size=10m 0 2 +#none /var/tmp tmpfs defaults,size=10m 0 2 +#END #-- Uncomment the line contains "cons" in /etc/inittab #cons:12345:respawn:/sbin/smart_agetty -L 38400 console