summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Housh <jaeger@crux.nu>2014-10-18 22:55:30 -0500
committerMatt Housh <jaeger@crux.nu>2014-10-18 22:56:06 -0500
commit7a8bfb2bcf4ea697c968ffe5a6d9340b0d75cb52 (patch)
tree59e6cac6dc340fb10d336a60308e214d77e491c9
parent595e78c0a1e524991e66ba844dcf2865d6adff33 (diff)
downloadiso-7a8bfb2bcf4ea697c968ffe5a6d9340b0d75cb52.tar.gz
iso-7a8bfb2bcf4ea697c968ffe5a6d9340b0d75cb52.tar.xz
Fixed rootfs tar options and added NLS CP and IO charset modules for VFAT
-rwxr-xr-xinitramfs/init4
-rw-r--r--initramfs/initramfs.lst3
2 files changed, 5 insertions, 2 deletions
diff --git a/initramfs/init b/initramfs/init
index 5b2516a..771ec36 100755
--- a/initramfs/init
+++ b/initramfs/init
@@ -109,7 +109,7 @@ find_and_mount_media() {
mount -t tmpfs tmpfs /newroot
checkReturn
echo -e -n " ${BOLD}${BLUE}*${NORM} Copying files from rootfs.tar.xz... "
- tar -xpf ${MEDIAMNT}/${PREFIX}/rootfs.tar.xz -C /newroot
+ tar -xJf ${MEDIAMNT}/${PREFIX}/rootfs.tar.xz -C /newroot
checkReturn
echo -e -n " ${BOLD}${BLUE}*${NORM} Copying devices from rootfs... "
cp -af /dev/* /newroot/dev/
@@ -180,7 +180,7 @@ then
# no notification for fs modules since they're generic
#echo -e -n "${BOLD}${BLUE}File Systems${NORM}"
for mod in exportfs crc32c libcrc32c isofs ext2 ext3 ext4 reiserfs xfs jfs \
- vfat msdos btrfs
+ nls_cp437 nls_iso8859-1 vfat msdos btrfs
do
if [ ! -z "$DEBUG" ]
then
diff --git a/initramfs/initramfs.lst b/initramfs/initramfs.lst
index d4170cb..a07bdeb 100644
--- a/initramfs/initramfs.lst
+++ b/initramfs/initramfs.lst
@@ -65,6 +65,7 @@ dir /lib/modules/#KERNEL_VERSION#/kernel/fs/jbd 755 0 0
dir /lib/modules/#KERNEL_VERSION#/kernel/fs/jbd2 755 0 0
dir /lib/modules/#KERNEL_VERSION#/kernel/fs/exportfs 755 0 0
dir /lib/modules/#KERNEL_VERSION#/kernel/fs/btrfs 755 0 0
+dir /lib/modules/#KERNEL_VERSION#/kernel/fs/nls 755 0 0
dir /lib/modules/#KERNEL_VERSION#/kernel/lib 755 0 0
dir /lib/modules/#KERNEL_VERSION#/kernel/lib/lzo 755 0 0
dir /lib/modules/#KERNEL_VERSION#/kernel/lib/raid6 755 0 0
@@ -214,6 +215,8 @@ file /lib/modules/#KERNEL_VERSION#/kernel/fs/jbd/jbd.ko ../kernel/linux-#KERNEL_
file /lib/modules/#KERNEL_VERSION#/kernel/fs/jbd2/jbd2.ko ../kernel/linux-#KERNEL_VERSION#/fs/jbd2/jbd2.ko 644 0 0
file /lib/modules/#KERNEL_VERSION#/kernel/fs/exportfs/exportfs.ko ../kernel/linux-#KERNEL_VERSION#/fs/exportfs/exportfs.ko 644 0 0
file /lib/modules/#KERNEL_VERSION#/kernel/fs/btrfs/btrfs.ko ../kernel/linux-#KERNEL_VERSION#/fs/btrfs/btrfs.ko 644 0 0
+file /lib/modules/#KERNEL_VERSION#/kernel/fs/nls/nls_cp437.ko ../kernel/linux-#KERNEL_VERSION#/fs/nls/nls_cp437.ko 644 0 0
+file /lib/modules/#KERNEL_VERSION#/kernel/fs/nls/nls_iso8859-1.ko ../kernel/linux-#KERNEL_VERSION#/fs/nls/nls_iso8859-1.ko 644 0 0
file /lib/modules/#KERNEL_VERSION#/kernel/lib/crc16.ko ../kernel/linux-#KERNEL_VERSION#/lib/crc16.ko 644 0 0
file /lib/modules/#KERNEL_VERSION#/kernel/lib/crc-itu-t.ko ../kernel/linux-#KERNEL_VERSION#/lib/crc-itu-t.ko 644 0 0
file /lib/modules/#KERNEL_VERSION#/kernel/lib/libcrc32c.ko ../kernel/linux-#KERNEL_VERSION#/lib/libcrc32c.ko 644 0 0

Generated by cgit