geninitrd-git.patch

   1 commit c6e700c36a25dd8c8438bbac6d53f5d558100d46
   2 Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
   3 Date:   Wed May 14 19:05:42 2014 +0200
   4
   5     Install 95-dm-notify.rules. Fixes problems with using dmcrypt and errors (in debug mode) like 'Udev cookie 0xd4dc311 (semid 229380) waiting for zero'
   6
   7 diff --git a/mod-udev.sh b/mod-udev.sh
   8 index dbb7c53..6e3008d 100644
   9 --- a/mod-udev.sh
  10 +++ b/mod-udev.sh
  11 @@ -47,7 +47,7 @@ initrd_gen_udev() {
  12         inst /etc/udev/udev.conf /etc/udev/udev.conf
  13         # standard udev rules
  14         inst_rules 50-udev-default.rules 60-persistent-storage.rules 61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \
  15 -               60-pcmcia.rules 50-firmware.rules 10-dm.rules 11-dm-lvm.rules 13-dm-disk.rules
  16 +               60-pcmcia.rules 50-firmware.rules 10-dm.rules 11-dm-lvm.rules 13-dm-disk.rules 95-dm-notify.rules
  17         # initrd dedicated rules
  18         inst_rules 01-ignore.rules 59-persistent-storage.rules 61-persistent-storage.rules 11-dm.rules
  19
  20 commit ff9aded51db8fa19316dde7864ec193f5fdf22b6
  21 Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
  22 Date:   Mon Jun 9 11:19:10 2014 +0200
  23
  24     Load configured font and do it early.
  25
  26 diff --git a/geninitrd b/geninitrd
  27 index 2478063..f31f00d 100755
  28 --- a/geninitrd
  29 +++ b/geninitrd
  30 @@ -202,6 +202,25 @@ mount_dev() {
  31         EOF
  32  }
  33
  34 +# load font
  35 +load_font() {
  36 +       local font
  37 +       [ ! -r /etc/sysconfig/console ] && return
  38 +       . /etc/sysconfig/console
  39 +       if [ -n "$CONSOLEFONT" ]; then
  40 +               font=$(ls -1 /lib/kbd/consolefonts/${CONSOLEFONT}*.gz 2> /dev/null)
  41 +               if [ -n "$font" ]; then
  42 +                       verbose "Loading font $font"
  43 +                       busybox_applet loadfont
  44 +                       inst_d "/lib/kbd/consolefonts"
  45 +                       cp -a "$font" "$DESTDIR/lib/kbd/consolefonts/"
  46 +                       gunzip ${DESTDIR}/lib/kbd/consolefonts/${CONSOLEFONT}*.gz
  47 +                       font=${font%.gz}
  48 +                       echo "loadfont < $font" | add_linuxrc
  49 +               fi
  50 +       fi
  51 +}
  52 +
  53  # generate code to mount /proc on initrd
  54  # can be called multiple times
  55  mount_proc() {
  56 @@ -1478,6 +1497,7 @@ add_linuxrc <<EOF
  57  # on $(LC_ALL=C date)
  58
  59  EOF
  60 +load_font
  61  mount_proc
  62
  63  kmsg "geninitrd/$VERSION starting"
  64 diff --git a/geninitrd b/geninitrd
  65 index f31f00d..74d8b70 100755
  66 --- a/geninitrd
  67 +++ b/geninitrd
  68 @@ -784,9 +784,22 @@ modules_install() {
  69                 MODULEDIR=${mod%/*}
  70                 inst_d "/lib/modules/$kernel/$MODULEDIR"
  71                 cp -a "/lib/modules/$kernel/$mod" "$DESTDIR/lib/modules/$kernel/$mod"
  72 -               gunzip "$DESTDIR/lib/modules/$kernel/$mod" 2> /dev/null
  73 +               case $mod in
  74 +                       *.gz)
  75 +                               gunzip "$DESTDIR/lib/modules/$kernel/$mod"
  76 +                               mod=${mod%.gz}
  77 +                               ;;
  78 +                       *.xz)
  79 +                               xz -d "$DESTDIR/lib/modules/$kernel/$mod"
  80 +                               mod=${mod%.xz}
  81 +                               ;;
  82 +                       *.bz2)
  83 +                               bzip2 -d "$DESTDIR/lib/modules/$kernel/$mod"
  84 +                               mod=${mod%.bz2}
  85 +                               ;;
  86 +               esac
  87                 if [ "$STRIP" ] && [ -x "$STRIP" ]; then
  88 -                       $STRIP -g --remove-section=.comment "$DESTDIR/lib/modules/$kernel/${mod%.gz}"
  89 +                       $STRIP -g --remove-section=.comment "$DESTDIR/lib/modules/$kernel/${mod}"
  90                 fi
  91         done
  92  }
  93 @@ -797,6 +810,8 @@ modules_add_linuxrc() {
  94         for mod in "$@"; do
  95                 # module path without optional compression
  96                 modpath=${mod%.gz}
  97 +               modpath=${modpath%.xz}
  98 +               modpath=${modpath%.bz2}
  99
 100                 # name of the module
 101                 local module=${modpath##*/}; module=${module%$modext}