- rel 5; mount /run with 0755 (security issue)

[packages/geninitrd.git] / geninitrd-git.patch

diff --git a/geninitrd-git.patch b/geninitrd-git.patch
index 706c2640976f95cc52e171117d2d909ee1dfa4be..0ee27c0eb0944a9df83537d426cf64b7f4c5f526 100644 (file)
--- a/geninitrd-git.patch
+++ b/geninitrd-git.patch
@@ -1,19 +1,77 @@
-commit c6e700c36a25dd8c8438bbac6d53f5d558100d46
+diff --git a/geninitrd b/geninitrd
+index 7b962b5..a4de196 100755
+--- a/geninitrd
++++ b/geninitrd
+@@ -1103,8 +1103,7 @@ sym_exists() {
+ # find best compressor (or forced one) for initrd
+ find_compressor() {
+       local mode="$1"
+-      # fastest initrd decompression speed is first
+-      local compressors='lzo gzip xz lzma bzip2'
++      local compressors='xz lzma bzip2 gzip lzo'
+ 
+       # a specified one, take it
+       if ! is_yes "$mode"; then
+diff --git a/mod-md.sh b/mod-md.sh
+index a0cd7aa..d9093d4 100644
+--- a/mod-md.sh
++++ b/mod-md.sh
+@@ -139,13 +139,15 @@ initrd_gen_md() {
+ 
+       inst_exec $mdassemble /bin/mdassemble
+ 
++      echo "DEVICE partitions containers" >> "$DESTDIR/etc/mdadm.conf"
++
+       # LVM on RAID case
+       local dev_list_extra ex_dev
+       dev_list_extra=$(awk '/^DEVICE / { for (i=2; i<=NF; i++) { printf "%s ", $i; }; } ' /etc/mdadm.conf | xargs)
+       new_dev_list_extra=""
+       for ex_dev in $dev_list_extra; do
+-              if [ "$ex_dev" = "partitions" ]; then
+-                      echo "DEVICE partitions" >> "$DESTDIR/etc/mdadm.conf"
++              if [ "$ex_dev" = "partitions" -o "$ex_dev" = "containers" ]; then
++                      echo "DEVICE $ex_dev" >> "$DESTDIR/etc/mdadm.conf"
+                       # FIXME: find and copy partition devices from /proc/partitions
+                       #        - best if done at runtime, now initrd gen time
+                       continue
+commit 11202855dbaee5bc32209913df1ae8738c210c39
 Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
-Date:   Wed May 14 19:05:42 2014 +0200
+Date:   Sat May 14 00:36:02 2016 +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'
+    Make rootdev fallback work.
 
-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
+diff --git a/geninitrd b/geninitrd
+index 92a519d..771245e 100755
+--- a/geninitrd
++++ b/geninitrd
+@@ -1004,7 +1004,11 @@ initrd_gen_initramfs_switchroot() {
+ 
+               # XXX hack, fallback to rootdev from geninitrd time
+               if [ ! -e "$device" ]; then
++      EOF
++      add_linuxrc <<-EOF
+                       device="$rootdev"
++      EOF
++      add_linuxrc <<-'EOF'
+                       echo "DEVICE set to $device based on fstab entry from initrd gen time"
+               fi
+ 
+commit 583a7f5f8783fb1f92b75ca9f651d675df016b73
+Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
+Date:   Tue Jun 7 08:30:46 2016 +0200
+
+    Mount /run with 0755.
+
+diff --git a/geninitrd b/geninitrd
+index 771245e..62e47ee 100755
+--- a/geninitrd
++++ b/geninitrd
+@@ -273,7 +273,7 @@ mount_run() {
+       fi
+ 
+       run_mounted=yes
+-      echo "mount -t tmpfs run /run" | add_linuxrc
++      echo "mount -t tmpfs run /run -o mode=0755" | add_linuxrc
+ }
  
+ # unmount all mountpoints mounted by geninitrd