X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=prep.sh;h=ba985b9487b6583c477c06def6cf78c04cd08fcf;hb=5db77cd2ee7f704b733091b223844d5b6b55dc9c;hp=59b80aae2b81c5cd017602f495635ae26051b73d;hpb=a1dc5376e0df2b95b1d3061f48352905f47b08ef;p=bootcd.git diff --git a/prep.sh b/prep.sh index 59b80aa..ba985b9 100755 --- a/prep.sh +++ b/prep.sh @@ -39,7 +39,7 @@ bootcd=$PWD/build/bootcd install -d -m 755 $bootcd # Write version number -rpmquery --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 > build/version.txt +rpm -q --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 > build/version.txt echo $nodefamily > build/nodefamily # Install base system @@ -95,10 +95,13 @@ fi 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 + 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/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 fi # Install fallback node configuration file