keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tar2fs: handle single boot label as default

Browse Source 
No sense to "provide" choice when there's none.
This commit is contained in:
Michael Shigorin 2018-10-18 19:45:23 +03:00
parent b724c1c271
commit c71ff2a39e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/tar2fs
View File

@ -228,6 +228,9 @@ esac
# NB: don't stick BOOTFS here, it has slightly different semantics # NB: don't stick BOOTFS here, it has slightly different semantics
pushd $ROOTFS/boot pushd $ROOTFS/boot
# 4.9.76-elbrus-def-alt1.11.1 -> def
get_label() { echo "${1# *}" | sed -r 's,.*elbrus-([0-9a-z]+)-.*$,\1,'; }
KVERSIONS= KVERSIONS=
if [ -s .origver ]; then if [ -s .origver ]; then
while read kver; do while read kver; do
@ -241,16 +244,22 @@ rm -f .origver
# ...target device too # ...target device too
sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab" sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
echo "** KVERSIONS=[$KVERSIONS]" >&2
if [ "`echo $KVERSIONS | wc -w`" = 1 ]; then # 2+ labels
echo -e "default=`get_label $KVERSIONS`\n" >> boot.conf
fi
# FIXME: relies on particular (current) kernel package naming scheme # FIXME: relies on particular (current) kernel package naming scheme
for v in $KVERSIONS; do for v in $KVERSIONS; do
l="$(echo "$v" | sed -r 's,.*elbrus-([0-9a-z]+)-.*$,\1,')" l="`get_label "$v"`"
cat >> boot.conf <<EOF cat >> boot.conf <<EOF
label=$l label=$l
partition=0 partition=0
image=/image-$v image=/image-$v
initrd=/initrd-$v.img initrd=/initrd-$v.img
cmdline=console=ttyS0,115200 console=tty0 consoleblank=0 hardreset root=UUID=$ROOTUUID cmdline=console=ttyS0,115200 console=tty0 consoleblank=0 hardreset root=UUID=$ROOTUUID
EOF EOF
done done