From ca9627e70852f6b2e835660df870fe3ab405882d Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Sun, 1 Sep 2019 00:00:32 +0200
Subject: Initial import

---
 sys-apps/mkinitrd/files/mkinitrd-ds.patch | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 sys-apps/mkinitrd/files/mkinitrd-ds.patch

(limited to 'sys-apps/mkinitrd/files/mkinitrd-ds.patch')

diff --git a/sys-apps/mkinitrd/files/mkinitrd-ds.patch b/sys-apps/mkinitrd/files/mkinitrd-ds.patch
new file mode 100644
index 0000000..10d4871
--- /dev/null
+++ b/sys-apps/mkinitrd/files/mkinitrd-ds.patch
@@ -0,0 +1,42 @@
+diff -dPNur mkinitrd-4.2.17/mkinitrd mkinitrd-4.2.17-csa/mkinitrd
+--- mkinitrd-4.2.17/mkinitrd	2005-10-28 07:35:15.000000000 +0000
++++ mkinitrd-4.2.17-csa/mkinitrd	2005-10-28 07:40:56.000000000 +0000
+@@ -61,6 +61,8 @@
+ 
+ [ -f /etc/sysconfig/mkinitrd ] && source /etc/sysconfig/mkinitrd
+ 
++mount /boot &> /dev/null
++
+ usage () {
+     echo "usage: `basename $0` [--version] [-v] [-f] [--preload <module>]" >&2
+     echo "       [--with=<module>] [--omit-scsi-modules] [--omit-raid-modules]" >&2
+@@ -1134,6 +1136,8 @@
+ 	echo "pivot_root /sysroot /sysroot/initrd" >> $RCFILE
+ 	[ -n "$kernel25" ] && echo "umount /initrd/sys" >> $RCFILE
+ 	echo "umount /initrd/proc" >> $RCFILE
++	echo "umount /initrd/dev" >> $RCFILE
++	echo "umount /initrd" >> $RCFILE
+     fi
+ else
+     [ -n "$readonly" ] && echo "umount /dev" >> $RCFILE
+@@ -1154,7 +1158,7 @@
+ 
+ case $initrdfs in
+     ext2|ext3|minix)
+-	for i in `/bin/find $MNTIMAGE -printf '%k\n'`; do
++	for i in `find $MNTIMAGE -printf '%k\n'`; do
+ 	    IMAGESIZE=$[IMAGESIZE + $i]
+ 	    NB_INODES=$[NB_INODES + 1]
+ 	done
+diff -dPNur mkinitrd-4.2.17/nash/nash.c mkinitrd-4.2.17-csa/nash/nash.c
+--- mkinitrd-4.2.17/nash/nash.c	2005-10-28 07:35:15.000000000 +0000
++++ mkinitrd-4.2.17-csa/nash/nash.c	2005-10-28 07:35:22.000000000 +0000
+@@ -1078,7 +1078,7 @@
+ 	return 1;
+     }
+ 
+-    if (umount(path)) {
++    if (umount2(path,MNT_DETACH)) {
+ 	printf("umount %s failed: %d\n", path, errno);
+ 	return 1;
+     }
-- 
cgit v1.2.3