commit c6e700c36a25dd8c8438bbac6d53f5d558100d46 Author: Arkadiusz Miśkiewicz Date: Wed May 14 19:05:42 2014 +0200 Install 95-dm-notify.rules. Fixes problems with using dmcrypt and errors (in debug mode) like 'Udev cookie 0xd4dc311 (semid 229380) waiting for zero' diff --git a/mod-udev.sh b/mod-udev.sh index dbb7c53..6e3008d 100644 --- a/mod-udev.sh +++ b/mod-udev.sh @@ -47,7 +47,7 @@ initrd_gen_udev() { inst /etc/udev/udev.conf /etc/udev/udev.conf # standard udev rules inst_rules 50-udev-default.rules 60-persistent-storage.rules 61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \ - 60-pcmcia.rules 50-firmware.rules 10-dm.rules 11-dm-lvm.rules 13-dm-disk.rules + 60-pcmcia.rules 50-firmware.rules 10-dm.rules 11-dm-lvm.rules 13-dm-disk.rules 95-dm-notify.rules # initrd dedicated rules inst_rules 01-ignore.rules 59-persistent-storage.rules 61-persistent-storage.rules 11-dm.rules commit ff9aded51db8fa19316dde7864ec193f5fdf22b6 Author: Arkadiusz Miśkiewicz Date: Mon Jun 9 11:19:10 2014 +0200 Load configured font and do it early. diff --git a/geninitrd b/geninitrd index 2478063..f31f00d 100755 --- a/geninitrd +++ b/geninitrd @@ -202,6 +202,25 @@ mount_dev() { EOF } +# load font +load_font() { + local font + [ ! -r /etc/sysconfig/console ] && return + . /etc/sysconfig/console + if [ -n "$CONSOLEFONT" ]; then + font=$(ls -1 /lib/kbd/consolefonts/${CONSOLEFONT}*.gz 2> /dev/null) + if [ -n "$font" ]; then + verbose "Loading font $font" + busybox_applet loadfont + inst_d "/lib/kbd/consolefonts" + cp -a "$font" "$DESTDIR/lib/kbd/consolefonts/" + gunzip ${DESTDIR}/lib/kbd/consolefonts/${CONSOLEFONT}*.gz + font=${font%.gz} + echo "loadfont < $font" | add_linuxrc + fi + fi +} + # generate code to mount /proc on initrd # can be called multiple times mount_proc() { @@ -1478,6 +1497,7 @@ add_linuxrc < /dev/null + case $mod in + *.gz) + gunzip "$DESTDIR/lib/modules/$kernel/$mod" + mod=${mod%.gz} + ;; + *.xz) + xz -d "$DESTDIR/lib/modules/$kernel/$mod" + mod=${mod%.xz} + ;; + *.bz2) + bzip2 -d "$DESTDIR/lib/modules/$kernel/$mod" + mod=${mod%.bz2} + ;; + esac if [ "$STRIP" ] && [ -x "$STRIP" ]; then - $STRIP -g --remove-section=.comment "$DESTDIR/lib/modules/$kernel/${mod%.gz}" + $STRIP -g --remove-section=.comment "$DESTDIR/lib/modules/$kernel/${mod}" fi done } @@ -797,6 +810,8 @@ modules_add_linuxrc() { for mod in "$@"; do # module path without optional compression modpath=${mod%.gz} + modpath=${modpath%.xz} + modpath=${modpath%.bz2} # name of the module local module=${modpath##*/}; module=${module%$modext}