X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=prep.sh;h=a679ed928b42319c1a7302e5561362566a1caba8;hb=6ab33596be06c94f1e60515a026724318c783769;hp=473d25eb28d894158f0ea5a18e8c1d69f7d765a5;hpb=f40e9c9c3d86a0862308cbd6a999f3cb7d468253;p=bootcd.git diff --git a/prep.sh b/prep.sh index 473d25e..a679ed9 100755 --- a/prep.sh +++ b/prep.sh @@ -28,6 +28,7 @@ export PATH pldistro=$1 ; shift nodefamily=$1; shift +rpmversion=$1; shift # Packages to install, junk and precious : see build//bootcd.pkgs @@ -39,16 +40,17 @@ bootcd=$PWD/build/bootcd 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 @@ -63,18 +65,6 @@ for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot install -D -m 755 initscripts/$file $bootcd/etc/init.d/$file done -# Install systemd files -echo "* Installing systemd files" -for file in pl_boot.service pl_boot.target pl_sysinit.service pl_sysinit.target; do - install -D -m 644 systemd/$file $bootcd/lib/systemd/system -done -ln -sf /lib/systemd/system/pl_boot.target $bootcd/etc/systemd/system/default.target -mkdir -p $bootcd/lib/systemd/system/pl_boot.target.wants -mkdir -p $bootcd/lib/systemd/system/pl_sysinit.target.wants -ln -sf /lib/systemd/system/pl_boot.service $bootcd/lib/systemd/system/pl_boot.target.wants/pl_boot.service -ln -sf /lib/systemd/system/pl_sysinit.service $bootcd/lib/systemd/system/pl_sysinit.target.wants/pl_sysinit.service - - # Install configuration files echo "* Installing configuration files" for file in fstab mtab modprobe.conf inittab hosts sysctl.conf ; do @@ -91,8 +81,9 @@ if [ -d $bootcd/etc/event.d ] ; then # 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 -elif [ -d $bootcd/etc/init ] ; then +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 @@ -101,6 +92,18 @@ elif [ -d $bootcd/etc/init ] ; then 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 "* Enabling getty on tty2" + # 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 + ln -sf /usr/lib/systemd/system/getty@.service $bootcd/etc/systemd/system/pl_boot.target.wants/getty@tty2.service +fi # Install fallback node configuration file echo "* Installing fallback node configuration file" @@ -117,6 +120,7 @@ install -d -m 755 $isofs 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