From 1f1ad0824ccf4934c2f8d710dd1ecf751b386c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= <ertugrulerata@gmail.com>
Date: Mon, 3 Apr 2017 23:54:23 +0300
Subject: [PATCH] mkinitramfs fix booting live usb. thanks @rmys

---
 kernel/tools/mkinitramfs/comar/pakhandler.py |  2 +-
 kernel/tools/mkinitramfs/files/init          | 18 +++++++++---------
 kernel/tools/mkinitramfs/pspec.xml           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/kernel/tools/mkinitramfs/comar/pakhandler.py b/kernel/tools/mkinitramfs/comar/pakhandler.py
index 1ac747a7..39a202f9 100644
--- a/kernel/tools/mkinitramfs/comar/pakhandler.py
+++ b/kernel/tools/mkinitramfs/comar/pakhandler.py
@@ -21,4 +21,4 @@ def cleanupPackage(metapath, filepath):
     pass
 
 def postCleanupPackage(metapath, filepath):
-    pass
+    generate_initramfs(filepath)
diff --git a/kernel/tools/mkinitramfs/files/init b/kernel/tools/mkinitramfs/files/init
index 91a3f0c4..b41f8ab1 100644
--- a/kernel/tools/mkinitramfs/files/init
+++ b/kernel/tools/mkinitramfs/files/init
@@ -90,11 +90,11 @@ probe_kms() {
     for device in /sys/bus/pci/devices/*/boot_vga; do
         [ -f $device ] || continue
         info "Loading KMS driver"
-        grep -q 1 $device && modprobe -q `cat ${device%boot_vga}modalias`
+        grep -q 1 $device && modprobe -bq `cat ${device%boot_vga}modalias`
     done
     if [ ! -c /dev/fb0 ]; then
         echo "options uvesafb scroll=ywrap mtrr=0 nocrtc=1 mode_option=1024x768-32" > /etc/modprobe.d/uvesafb.conf
-        modprobe -q uvesafb
+        modprobe -bq uvesafb
     fi
 }
 
@@ -105,7 +105,7 @@ probe_pci_devices() {
         [ -f $module ] || continue
         MODULES="$MODULES $(cat $module)"
     done
-    modprobe -q $MODULES
+    modprobe -bqa $MODULES
 }
 
 probe_usb_devices() {
@@ -115,13 +115,12 @@ probe_usb_devices() {
         [ -f $module ] || continue
         MODULES="$MODULES $(cat $module)"
     done
-    modprobe -q $MODULES
+    modprobe -bqa $MODULES
 }
 
 probe_raid() {
     info "Probing RAID devices"
-    #modprobe -bq dm-mod raid0 raid1 raid10 raid456
-    modprobe -q raid0 raid1 raid10 raid456
+    modprobe -bqa dm-mod raid0 raid1 raid10 raid456
     if [ -x /sbin/mdadm ]
     then
         /sbin/mdadm --examine --scan > /etc/mdadm.conf
@@ -131,7 +130,7 @@ probe_raid() {
 
 probe_lvm() {
     info "Probing LVM devices"
-    # modprobe -q dm-mod
+    modprobe -qa dm-mod
     if [ -x /sbin/lvm ]
     then
         /sbin/lvm vgscan --ignorelockingfailure &> /dev/null
@@ -145,7 +144,7 @@ probe_virtio_devices() {
         [ -f $module ] || continue
         MODULES="$MODULES $(cat $module)"
     done
-    modprobe -q $MODULES
+    modprobe -bqa $MODULES
 }
 
 #################################
@@ -159,6 +158,7 @@ mount_rootfs() {
 }
 
 find_live_mount() {
+    modprobe -bqa usb-storage udf
     if [ "$#" -gt "0" ]
     then
         for x in $*
@@ -519,7 +519,7 @@ then
     manage_tmpfs
 
     # modprobe filesystems that are not in kernel, for live disks
-    modprobe -q nls_cp857 nls_utf8 vfat
+    modprobe -qa nls_cp857 nls_utf8 vfat
 
     for i in `seq 50`
     do
diff --git a/kernel/tools/mkinitramfs/pspec.xml b/kernel/tools/mkinitramfs/pspec.xml
index 5178bc42..db2d4ba5 100644
--- a/kernel/tools/mkinitramfs/pspec.xml
+++ b/kernel/tools/mkinitramfs/pspec.xml
@@ -45,7 +45,7 @@
 
     <History>
          <Update release="4">
-            <Date>2017-03-29</Date>
+            <Date>2017-04-03</Date>
             <Version>1.0.7</Version>
             <Comment>fix #626</Comment>
             <Name>PisiLinux Community</Name>