From 58c16e2b11291bfd5b8940421d6a633400244b2decf5ed95e7f3cb793a710c28 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 4 Sep 2012 19:14:31 +0000
Subject: [PATCH] move additional modules to mkinitrd to prevent loading
 everything rely on autoloading instead add also nls modules, remove ecrypt

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=76
---
 libguestfs.mkinitrd.boot.sh |  2 +-
 libguestfs.spec             | 67 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/libguestfs.mkinitrd.boot.sh b/libguestfs.mkinitrd.boot.sh
index 2cd04e5..0fac81b 100644
--- a/libguestfs.mkinitrd.boot.sh
+++ b/libguestfs.mkinitrd.boot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #%stage: block
 #
-#%modules: dm-mod virtio_blk virtio_console virtio_net virtio_pci virtio_scsi sg sd_mod sr_mod 9p btrfs cramfs ecryptfs ext2 ext3 ext4 fat fuse hfs hfsplus jfs minix ncpfs nfs quota reiserfs squashfs squashfs3 udf ufs xfs
+#%modules: dm-mod virtio_blk virtio_console virtio_net virtio_pci virtio_scsi sg sd_mod sr_mod
 #
 #%programs: mdadm
 #%programs: modprobe
diff --git a/libguestfs.spec b/libguestfs.spec
index cdd96fb..5ea7f97 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -458,6 +458,71 @@ do
 done
 chmod -v 755 mkinitrd/bin_tmp/*
 #
+additional_modules="
+loop
+
+9p
+btrfs
+cramfs
+ext2
+ext3
+ext4
+fat
+fuse
+hfs
+hfsplus
+jfs
+minix
+nfs
+quota
+reiserfs
+squashfs
+squashfs3
+udf
+ufs
+xfs
+
+nls_ascii
+nls_cp1250
+nls_cp1251
+nls_cp1255
+nls_cp437
+nls_cp737
+nls_cp775
+nls_cp850
+nls_cp852
+nls_cp855
+nls_cp857
+nls_cp860
+nls_cp861
+nls_cp862
+nls_cp863
+nls_cp864
+nls_cp865
+nls_cp866
+nls_cp869
+nls_cp874
+nls_cp932
+nls_cp936
+nls_cp949
+nls_cp950
+nls_euc-jp
+nls_iso8859-1
+nls_iso8859-13
+nls_iso8859-14
+nls_iso8859-15
+nls_iso8859-2
+nls_iso8859-3
+nls_iso8859-4
+nls_iso8859-5
+nls_iso8859-6
+nls_iso8859-7
+nls_iso8859-9
+nls_koi8-r
+nls_koi8-ru
+nls_koi8ru
+nls_utf8
+"
 env PATH=$PWD/mkinitrd/bin_tmp:${PATH} \
 bash -x \
 /sbin/mkinitrd \
@@ -465,7 +530,7 @@ bash -x \
 	-k vmlinuz.${arch} \
 	-i initramfs.${arch}.img \
 	-b $PWD/mkinitrd/boot_tmp \
-	-m 'loop' \
+	-m "$additional_modules" \
 	-B
 #
 mkdir -vp $RPM_BUILD_ROOT%{_libdir}/guestfs