X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=prep.sh;h=a679ed928b42319c1a7302e5561362566a1caba8;hb=e446dbf789817429d3648fec50bb0c7e1b605e43;hp=38f2a0bd3f5630681e6150da4f4509063ce28d86;hpb=d72a9e931dc589dd5f421a12177b3ac46f8fb0be;p=bootcd.git

diff --git a/prep.sh b/prep.sh
index 38f2a0b..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/<pldistro>/bootcd.pkgs
 
@@ -39,8 +40,8 @@ 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"
@@ -49,7 +50,7 @@ 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
 
@@ -92,19 +93,16 @@ if [ -d $bootcd/etc/init ] ; then
     popd    
 fi
 # Install systemd files for f16 and above
-# NOTE: pl_sysinit is actually invoked in the pl_boot service file
-# ExecStartPre=/etc/init.d/pl_sysinit
-# this is auick and dirty but does the job
 if [ -d $bootcd/etc/systemd/system ] ; then
     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
+    for file in pl_boot.service pl_boot.target ; do
+        install -D -m 644 systemd/$file $bootcd/etc/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
+    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
@@ -122,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