diff --git a/lib/initcpio/hooks/arch_filesystems_lowmem b/lib/initcpio/hooks/arch_filesystems_lowmem index c5a58c14c..d6a982ded 100644 --- a/lib/initcpio/hooks/arch_filesystems_lowmem +++ b/lib/initcpio/hooks/arch_filesystems_lowmem @@ -11,6 +11,14 @@ run_hook () # fix jfs symlinks ln -s /sbin/jfs_mkfs /sbin/mkfs.jfs + # fix ntfs symlinks + ln -s /usr/sbin/mkntfs /sbin/mkfs.ntfs + ln -s /usr/bin/ntfsmount /sbin/mount.ntfs-fuse + ln -s /usr/bin/ntfsmount /sbin/mount.fuse.ntfs + + # fix ntfs-3g symlink + ln -s /bin/ntfs-3g /sbin/mount.ntfs-3g + # fix vfat symlink ln -s /sbin/mkdosfs /sbin/mkfs.vfat ln -s /sbin/mkdosfs /sbin/mkfs.msdos diff --git a/lib/initcpio/install/arch_filesystems_lowmem b/lib/initcpio/install/arch_filesystems_lowmem index 1075c006d..7214723ff 100644 --- a/lib/initcpio/install/arch_filesystems_lowmem +++ b/lib/initcpio/install/arch_filesystems_lowmem @@ -2,8 +2,8 @@ install () { - MODULES=" $(checked_modules '/kernel/fs/reiserfs') $(checked_modules '/kernel/fs/ext2') $(checked_modules '/kernel/fs/ext3') $(checked_modules '/kernel/fs/ext4') $(checked_modules '/kernel/fs/jfs') $(checked_modules '/kernel/fs/xfs') $(checked_modules '/kernel/fs/vfat') $(checked_modules '/kernel/fs/fat') $(checked_modules '/kernel/fs/isofs') $(checked_modules '/kernel/fs/nls/nls_cp437')" - BINARIES="mkswap mkfs.reiserfs mkfs.ext2 jfs_fsck jfs_mkfs mkfs.xfs xfs_freeze xfs_io mkdosfs blkid" + MODULES=" $(checked_modules '/kernel/fs/reiserfs') $(checked_modules '/kernel/fs/ext2') $(checked_modules '/kernel/fs/ext3') $(checked_modules '/kernel/fs/ext4') $(checked_modules '/kernel/fs/jfs') $(checked_modules '/kernel/fs/xfs') $(checked_modules '/kernel/fs/vfat') $(checked_modules '/kernel/fs/fat') $(checked_modules '/kernel/fs/isofs') $(checked_modules '/kernel/fs/nls/nls_cp437') $(checked_modules '/kernel/fs/fuse')" + BINARIES="mkswap mkfs.reiserfs mkfs.ext2 jfs_fsck jfs_mkfs mkfs.xfs xfs_freeze xfs_io mkdosfs blkid mkntfs mountntfs ntfs-3g" FILES="" SCRIPT="arch_filesystems_lowmem" } diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup index 0dfe48e7c..215309492 100755 --- a/usr/share/archboot/installer/setup +++ b/usr/share/archboot/installer/setup @@ -336,7 +336,7 @@ _mkfs() { else # make sure the fstype is one we can handle local knownfs=0 - for fs in xfs jfs reiserfs ext2 ext3 ext4 vfat; do + for fs in xfs jfs reiserfs ext2 ext3 ext4 ntfs vfat; do [ "${_fstype}" = "${fs}" ] && knownfs=1 && break done if [ $knownfs -eq 0 ]; then @@ -350,9 +350,10 @@ _mkfs() { xfs) mkfs.xfs -f ${_device} >$LOG 2>&1; ret=$? ;; jfs) yes | mkfs.jfs ${_device} >$LOG 2>&1; ret=$? ;; reiserfs) yes | mkreiserfs ${_device} >$LOG 2>&1; ret=$? ;; - ext2) mke2fs "${_device}" >$LOG 2>&1; ret=$? ;; - ext3) mke2fs -j ${_device} >$LOG 2>&1; ret=$? ;; + ext2) mkfs.ext2 ${_device} >$LOG 2>&1; ret=$? ;; + ext3) mkfs.ext3 ${_device} >$LOG 2>&1; ret=$? ;; ext4) mkfs.ext4 ${_device} >$LOG 2>&1; ret=$? ;; + ntfs) mkfs.ntfs ${_device} >$LOG 2>&1; ret=$? ;; vfat) mkfs.vfat ${_device} >$LOG 2>&1; ret=$? ;; # don't handle anything else here, we will error later esac @@ -633,6 +634,7 @@ mountpoints() { [ "$(which mkreiserfs 2>/dev/null)" ] && FSOPTS="$FSOPTS reiserfs Reiser3" [ "$(which mkfs.xfs 2>/dev/null)" ] && FSOPTS="$FSOPTS xfs XFS" [ "$(which mkfs.jfs 2>/dev/null)" ] && FSOPTS="$FSOPTS jfs JFS" + [ "$(which mkfs.ntfs 2>/dev/null)" ] && FSOPTS="$FSOPTS ntfs NTFS" [ "$(which mkfs.vfat 2>/dev/null)" ] && FSOPTS="$FSOPTS vfat VFAT" #