X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=prep.sh;h=05a7a6937aab52be5f16489b21f1042d7d0a442e;hb=025e3234621c9dfe7e30dee61e4fa896d24629f2;hp=ba985b9487b6583c477c06def6cf78c04cd08fcf;hpb=5db77cd2ee7f704b733091b223844d5b6b55dc9c;p=bootcd.git diff --git a/prep.sh b/prep.sh index ba985b9..05a7a69 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,8 +40,8 @@ bootcd=$PWD/build/bootcd install -d -m 755 $bootcd # Write version number -rpm -q --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 @@ -59,7 +60,7 @@ install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac # Install initscripts echo "* Installing initscripts" -for file in pl_functions 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 pl_wrapper ; 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 @@ -100,8 +101,8 @@ if [ -d $bootcd/etc/systemd/system ] ; then 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/default.target.wants ] || mkdir -p $bootcd/etc/systemd/system/default.target.wants - ln -sf /usr/lib/systemd/system/getty@.service $bootcd/etc/systemd/system/default.target.wants/getty@tty2.service + [ -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