pldistro=$1 ; shift
nodefamily=$1; shift
+rpmversion=$1; shift
# Packages to install, junk and precious : see build/<pldistro>/bootcd.pkgs
install -d -m 755 $bootcd
# Write version number
-rpmquery --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 > build/version.txt
-echo $nodefamily > build/nodefamily
+echo ${rpmversion} > build/version.txt
+echo ${nodefamily} > build/nodefamily
# Install base system
+echo "* Creating fedora root image"
pl_root_makedevs $bootcd
pkgsfile=$(pl_locateDistroFile ../build/ $pldistro bootcd.pkgs)
pl_root_mkfedora $bootcd $pldistro $pkgsfile
pl_root_tune_image $bootcd
-# Add site_admin console account to BootCD: with root priv, and empty passwd
+# Add site_admin console account to BootCD: with root priv, and self passwd
CRYPT_SA_PASSWORD=$(python -c "import crypt, random, string; salt = [random.choice(string.letters + string.digits + \"./\") for i in range(0,8)] ; print crypt.crypt('site_admin', '\$1\$' + \"\".join(salt) + '\$')")
chroot ${bootcd} /usr/sbin/useradd -p "$CRYPT_SA_PASSWORD" -o -g 0 -u 0 -m site_admin
echo "* Installing IPMI utilities"
install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac
-# Install configuration files
-echo "* Installing configuration files"
-for file in fstab mtab modprobe.conf inittab hosts sysctl.conf ; do
- install -D -m 644 etc/$file $bootcd/etc/$file
-done
-
# Install initscripts
echo "* Installing initscripts"
-for file in pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot ; do
+for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot ; do
sed -i -e "s,@PLDISTRO@,$pldistro,g" -e "s,@FCDISTRO@,$fcdistro,g" initscripts/$file
install -D -m 755 initscripts/$file $bootcd/etc/init.d/$file
done
-# connect the scripts for upstart
+# Install configuration files
+echo "* Installing configuration files"
+for file in fstab mtab modprobe.conf inittab hosts sysctl.conf ; do
+ install -D -m 644 etc/$file $bootcd/etc/$file
+done
+# connect our initscripts scripts for upstart
# fedora 9 comes with /sbin/init from upstart, that uses /etc/event.d instead of inittab
# (in fact inittab is read for determining the default runlevel)
if [ -d $bootcd/etc/event.d ] ; then
- echo "* Tuning /etc/event.d for upstart"
+ echo "* Tuning /etc/event.d/ for upstart"
pushd $bootcd/etc/event.d
# use our system initialisation script
- sed -i -e 's,/etc/rc.d/rc.sysinit[a-z\.]*,/etc/init.d/pl_sysinit,g' *
+ sed -i -e 's,/etc/rc\.d/rc\.sysinit[a-z\.]*,/etc/init.d/pl_sysinit,g' rcS
# use our startup script in runlevel 2
sed -i -e 's,/etc/rc\.d/rc[ \t][ \t]*2,/etc/init.d/pl_boot,g' rc2
popd
fi
+# ditto for f14 and higher init style
+if [ -d $bootcd/etc/init ] ; then
+ echo "* Tuning /etc/init/ for upstart"
+ pushd $bootcd/etc/init
+ # use our system initialisation script
+ sed -i -e 's,/etc/rc\.d/rc\.sysinit[a-z\.]*,/bin/bash -c /etc/init.d/pl_sysinit,g' rcS.conf
+ # use our startup script in runlevel 2
+ sed -i -e 's,/etc/rc.d/rc[a-z\.]*,/etc/init.d/pl_boot,g' rc.conf
+ popd
+fi
+# Install systemd files for f16 and above
+if [ -d $bootcd/etc/systemd/system ] ; then
+ echo "* Installing systemd files"
+ for file in pl_boot.service pl_boot.target ; do
+ install -D -m 644 systemd/$file $bootcd/etc/systemd/system
+ done
+ echo "* Configuration BootCD to start up pl_boot"
+ # first attempt was to totally replace everything with pl_boot.target
+ # this however leads to physical f21 nodes not starting up properly
+ # because biosdevname is not properly honored and so pl_netinit gets confused
+ # select pl_boot target this way instead of using kargs, as kargs apply to kexec boot as well
+ # ln -sf /etc/systemd/system/pl_boot.target $bootcd/etc/systemd/system/default.target
+ #[ -d $bootcd/etc/systemd/system/pl_boot.target.wants ] || mkdir -p $bootcd/etc/systemd/system/pl_boot.target.wants
+ # Let's try another approach completely
+ # xxx if that worked we would not need pl_boot.target at all
+ mkdir -p $bootcd/etc/systemd/system/default.target.wants
+ ln -sf /etc/systemd/system/pl_boot.service $bootcd/etc/systemd/system/default.target.wants
+ echo "* Enabling getty on tty2"
+ #ln -sf /usr/lib/systemd/system/getty@.service $bootcd/etc/systemd/system/pl_boot.target.wants/getty@tty2.service
+ ln -sf /usr/lib/systemd/system/getty@.service $bootcd/etc/systemd/system/default.target.wants/getty@tty2.service
+fi
# Install fallback node configuration file
echo "* Installing fallback node configuration file"
for kernel in $bootcd/boot/vmlinuz-* ; do
if [ -f $kernel ] ; then
install -D -m 644 $kernel $isofs/kernel
+ echo "* BootCD kernel (1) created from $kernel"
+ echo "* kernel created (1) from $kernel" > $isofs/kernel.from
fi
done
+# patch - Thierry - dec. 2015
+# somehow we see this good-old code produce a bootcd without a /kernel
+# this is odd because as far as rpm is concerned, the name should not have changed
+# anyways, at this point, here's what can be found in /boot
+# [root@2015-12-07--f23-bcd boot]# pwd
+# /build/BUILD/bootcd-lxc-f23-x86_64-5.3/bootcd/build/bootcd/boot
+# [root@2015-12-07--f23-bcd boot]# ls -R
+# .:
+# 8adf0b93a7f44be69499d21fa18ab5b8 loader
+#
+# ./8adf0b93a7f44be69499d21fa18ab5b8:
+# 4.2.6-301.fc23.x86_64
+#
+# ./8adf0b93a7f44be69499d21fa18ab5b8/4.2.6-301.fc23.x86_64:
+# initrd linux
+#
+# ./loader:
+# entries
+#
+# ./loader/entries:
+# 8adf0b93a7f44be69499d21fa18ab5b8-4.2.6-301.fc23.x86_64.conf
+
+# second chance if first approach would not work
+if [ ! -f $isofs/kernel ] ; then
+ kernel=$(find $bootcd/boot -name linux)
+ if [ -f $kernel ] ; then
+ install -D -m 644 $kernel $isofs/kernel
+ echo "* BootCD kernel (2) created from $kernel"
+ echo "* kernel created (2) from $kernel" > $isofs/kernel.from
+ fi
+fi
+
+if [ ! -f $isofs/kernel ] ; then
+ echo "* BootCD prep.sh : FATAL: could not locate kernel - exiting"
+ exit 1
+fi
+
# Don't need /boot anymore
rm -rf $bootcd/boot
git://git.onelab.eu / bootcd.git / blobdiff