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_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
for file in pl_boot.service pl_boot.target ; do
install -D -m 644 systemd/$file $bootcd/etc/systemd/system
done
- echo "* Enabling getty on tty2"
+ 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
+ # 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
for kernel in $bootcd/boot/vmlinuz-* ; do
if [ -f $kernel ] ; then
install -D -m 644 $kernel $isofs/kernel
+ echo "* kernel created from $kernel" > $isofs/kernel.from
fi
done