wok-current diff linux/stuff/bootloader.sh @ rev 19437
compiz-ccsm, xvkbd: check depends, tried to fix startup with some locales
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Sun Oct 09 18:56:56 2016 +0300 (2016-10-09) |
parents | 1ed0f1f453b3 |
children |
line diff
1.1 --- a/linux/stuff/bootloader.sh Sun Jan 20 18:49:13 2013 +0100 1.2 +++ b/linux/stuff/bootloader.sh Sun Oct 09 18:56:56 2016 +0300 1.3 @@ -255,7 +255,7 @@ 1.4 size=$(( ($(stat -c %s "$i") + $INITRDPAD - 1) & -$INITRDPAD )) 1.5 [ -n "$DEBUG" ] && echo "initrd $i $size " 1>&2 1.6 initrdlen=$(( $initrdlen + $size )) 1.7 - [ -n "$ADRSRD" ] || ADRSRD=$(( (($MEM * 0x100000) - $initrdlen) & -$INITRDALIGN )) 1.8 + ADRSRD=$(( (($MEM * 0x100000) - $initrdlen) & -$INITRDALIGN )) 1.9 store 32 $RamfsAdrOfs $(( $ADRSRD )) $bs initrd adrs 1.10 store 32 $RamfsLenOfs $initrdlen $bs initrdlen 1.11 done