diff --git a/lib/initcpio/hooks/arch_filesystems b/lib/initcpio/hooks/arch_filesystems index 5805f6f7f..6d44adb1f 100644 --- a/lib/initcpio/hooks/arch_filesystems +++ b/lib/initcpio/hooks/arch_filesystems @@ -1,11 +1,8 @@ run_hook () { # fix reiserfs symlinks - ln -s /sbin/debugfs.reiserfs /sbin/debugreiserfs - ln -s /sbin/mkfs.reiserfs /sbin/mkreiserfs + ln -s /sbin/mkreiserfs /sbin/mkfs.reiserfs ln -s /sbin/reiserfsck /sbin/fsck.reiserfs - ln -s /sbin/resizefs.reiserfs /sbin/resize_reiserfs - ln -s /sbin/tunefs.reiserfs /sbin/reiserfstune # fix ext2/ext3/ext4 symlinks ln -s /sbin/e2fsck /sbin/fsck.ext2 diff --git a/lib/initcpio/hooks/arch_filesystems_lowmem b/lib/initcpio/hooks/arch_filesystems_lowmem index d6a982ded..de85c9f74 100644 --- a/lib/initcpio/hooks/arch_filesystems_lowmem +++ b/lib/initcpio/hooks/arch_filesystems_lowmem @@ -1,7 +1,7 @@ run_hook () { # fix reiserfs symlinks - ln -s /sbin/mkfs.reiserfs /sbin/mkreiserfs + ln -s /sbin/mkreiserfs /sbin/mkfs.reiserfs # fix ext2/ext3 symlinks ln -s /sbin/mkfs.ext2 /sbin/mkfs.ext3 diff --git a/lib/initcpio/install/arch_filesystems b/lib/initcpio/install/arch_filesystems index c1dc9329b..b22f5ed81 100644 --- a/lib/initcpio/install/arch_filesystems +++ b/lib/initcpio/install/arch_filesystems @@ -3,7 +3,7 @@ install () { MODULES=" $(checked_modules '/kernel/fs') " - BINARIES="mkswap debugfs.reiserfs mkfs.reiserfs reiserfsck tunefs.reiserfs resizefs.reiserfs badblocks blkid debugfs dumpe2fs e2fsck e2image findfs fsck logsave mkfs.ext2 resize2fs mkntfs ntfsmount ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck dosfslabel ntfs-3g mount.nfs mount.cifs umount.cifs" + BINARIES="mkswap debugreiserfs mkreiserfs reiserfsck reiserfstune resize_reiserfs badblocks blkid debugfs dumpe2fs e2fsck e2image findfs fsck logsave mkfs.ext2 resize2fs mkntfs ntfsmount ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck dosfslabel ntfs-3g mount.nfs mount.cifs umount.cifs" FILES="" SCRIPT="arch_filesystems" } diff --git a/lib/initcpio/install/arch_filesystems_lowmem b/lib/initcpio/install/arch_filesystems_lowmem index 7214723ff..ea6b17693 100644 --- a/lib/initcpio/install/arch_filesystems_lowmem +++ b/lib/initcpio/install/arch_filesystems_lowmem @@ -3,7 +3,7 @@ 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') $(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" + BINARIES="mkswap mkreiserfs 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/lib/initcpio/install/arch_net b/lib/initcpio/install/arch_net index ddf7e44a9..1034b6e93 100644 --- a/lib/initcpio/install/arch_net +++ b/lib/initcpio/install/arch_net @@ -23,12 +23,12 @@ install () add_file "/lib/tc/normal.dist" add_file "/lib/tc/pareto.dist" add_file "/lib/tc/paretonormal.dist" - add_file "/usr/share/archboot/net/etc/iproute2/ematch_map /etc/iproute2/ematch_map" - add_file "/usr/share/archboot/net/etc/iproute2/rt_dsfield /etc/iproute2/rt_dsfield" - add_file "/usr/share/archboot/net/etc/iproute2/etc/iproute2/rt_protos /etc/iproute2/rt_protos" - add_file "/usr/share/archboot/net/etc/iproute2/etc/iproute2/rt_realms /etc/iproute2/rt_realms" - add_file "/usr/share/archboot/net/etc/iproute2/etc/iproute2/rt_scopes /etc/iproute2/rt_scopes" - add_file "/usr/share/archboot/net/etc/iproute2/etc/iproute2/rt_tables /etc/iproute2/rt_tables" + add_file "/usr/share/archboot/net/etc/iproute2/ematch_map" "/etc/iproute2/ematch_map" + add_file "/usr/share/archboot/net/etc/iproute2/rt_dsfield" "/etc/iproute2/rt_dsfield" + add_file "/usr/share/archboot/net/etc/iproute2/rt_protos" "/etc/iproute2/rt_protos" + add_file "/usr/share/archboot/net/etc/iproute2/rt_realms" "/etc/iproute2/rt_realms" + add_file "/usr/share/archboot/net/etc/iproute2/rt_scopes" "/etc/iproute2/rt_scopes" + add_file "/usr/share/archboot/net/etc/iproute2/rt_tables" "/etc/iproute2/rt_tables" } help ()