mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
'removed filesystem hooks'
This commit is contained in:
parent
ebd8b5d70c
commit
18f39d6e0d
4 changed files with 2 additions and 100 deletions
|
@ -1,49 +0,0 @@
|
||||||
run_hook ()
|
|
||||||
{
|
|
||||||
#needed for switching
|
|
||||||
if ! [ "${root}" = "" ]; then
|
|
||||||
msg -n ":: Loading root filesystem module..."
|
|
||||||
if [ "x${rootfstype}" != "x" ]; then
|
|
||||||
FSTYPE="${rootfstype}"
|
|
||||||
else
|
|
||||||
if [ ! -e "${root}" ]; then
|
|
||||||
msg -e "\nAttempting to create root device '${root}'"
|
|
||||||
|
|
||||||
if [ "x${rootdelay}" != "x" ]; then
|
|
||||||
msg -n "Waiting for devices to settle..."
|
|
||||||
/bin/sleep "${rootdelay}"
|
|
||||||
msg "done."
|
|
||||||
export rootdelay=0
|
|
||||||
kinit_params="${kinit_params} rootdelay=0"
|
|
||||||
fi
|
|
||||||
|
|
||||||
eval $(/bin/parseblock "${root}")
|
|
||||||
if [ "${BLOCKNAME}" = "unknown" ]; then
|
|
||||||
FSTYPE="unknown"
|
|
||||||
echo "ERROR: Failed to parse block device name for '${root}'"
|
|
||||||
elif [ "x${BLOCKDEVICE}" = "x" ]; then
|
|
||||||
FSTYPE="unknown"
|
|
||||||
echo "ERROR: Failed to parse block device ids for '${root}'"
|
|
||||||
else
|
|
||||||
export root="${BLOCKNAME}"
|
|
||||||
echo "/bin/mknod \"${BLOCKNAME}\" b ${BLOCKDEVICE}"
|
|
||||||
/bin/mknod "${BLOCKNAME}" b ${BLOCKDEVICE} >/dev/null
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e "${root}" ]; then
|
|
||||||
eval $( /bin/fstype < "${root}" )
|
|
||||||
else
|
|
||||||
FSTYPE="unknown"
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
msg " ${FSTYPE}"
|
|
||||||
if [ "${FSTYPE}" = "unknown" ]; then
|
|
||||||
echo "ERROR: root fs cannot be detected. Try using the rootfstype= kernel parameter."
|
|
||||||
else
|
|
||||||
kinit_params="${kinit_params} rootfstype=${FSTYPE}"
|
|
||||||
/sbin/modprobe -q "${FSTYPE}" >/dev/null 2>&1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
|
@ -1,49 +0,0 @@
|
||||||
run_hook ()
|
|
||||||
{
|
|
||||||
#needed for switching
|
|
||||||
if ! [ "${root}" = "" ]; then
|
|
||||||
msg -n ":: Loading root filesystem module..."
|
|
||||||
if [ "x${rootfstype}" != "x" ]; then
|
|
||||||
FSTYPE="${rootfstype}"
|
|
||||||
else
|
|
||||||
if [ ! -e "${root}" ]; then
|
|
||||||
msg -e "\nAttempting to create root device '${root}'"
|
|
||||||
|
|
||||||
if [ "x${rootdelay}" != "x" ]; then
|
|
||||||
msg -n "Waiting for devices to settle..."
|
|
||||||
/bin/sleep "${rootdelay}"
|
|
||||||
msg "done."
|
|
||||||
export rootdelay=0
|
|
||||||
kinit_params="${kinit_params} rootdelay=0"
|
|
||||||
fi
|
|
||||||
|
|
||||||
eval $(/bin/parseblock "${root}")
|
|
||||||
if [ "${BLOCKNAME}" = "unknown" ]; then
|
|
||||||
FSTYPE="unknown"
|
|
||||||
echo "ERROR: Failed to parse block device name for '${root}'"
|
|
||||||
elif [ "x${BLOCKDEVICE}" = "x" ]; then
|
|
||||||
FSTYPE="unknown"
|
|
||||||
echo "ERROR: Failed to parse block device ids for '${root}'"
|
|
||||||
else
|
|
||||||
export root="${BLOCKNAME}"
|
|
||||||
echo "/bin/mknod \"${BLOCKNAME}\" b ${BLOCKDEVICE}"
|
|
||||||
/bin/mknod "${BLOCKNAME}" b ${BLOCKDEVICE} >/dev/null
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e "${root}" ]; then
|
|
||||||
eval $( /bin/fstype < "${root}" )
|
|
||||||
else
|
|
||||||
FSTYPE="unknown"
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
msg " ${FSTYPE}"
|
|
||||||
if [ "${FSTYPE}" = "unknown" ]; then
|
|
||||||
echo "ERROR: root fs cannot be detected. Try using the rootfstype= kernel parameter."
|
|
||||||
else
|
|
||||||
kinit_params="${kinit_params} rootfstype=${FSTYPE}"
|
|
||||||
/sbin/modprobe -q "${FSTYPE}" >/dev/null 2>&1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
|
@ -5,7 +5,7 @@ install ()
|
||||||
MODULES=" $(checked_modules '/kernel/fs') "
|
MODULES=" $(checked_modules '/kernel/fs') "
|
||||||
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 mkfs.reiserfs fsck.reiserfs fsck.ext2 fsck.ext3 e2label tune2fs mkfs.ext3 mkfs.ext4 mke2fs fsck.jfs mkfs.jfs mkfs.vfat mkfs.msdos fsck.msdos fsck.vfat mkfs.ntfs mount.ntfs-fuse mount.fuse.ntfs mount.ntfs-3g mount.nfs4 umount.nfs umount.nfs4"
|
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 mkfs.reiserfs fsck.reiserfs fsck.ext2 fsck.ext3 e2label tune2fs mkfs.ext3 mkfs.ext4 mke2fs fsck.jfs mkfs.jfs mkfs.vfat mkfs.msdos fsck.msdos fsck.vfat mkfs.ntfs mount.ntfs-fuse mount.fuse.ntfs mount.ntfs-3g mount.nfs4 umount.nfs umount.nfs4"
|
||||||
FILES=""
|
FILES=""
|
||||||
SCRIPT="arch_filesystems"
|
SCRIPT=""
|
||||||
# fix licenses
|
# fix licenses
|
||||||
add_file "/usr/share/licenses/e2fsprogs/BSD-LICENSE"
|
add_file "/usr/share/licenses/e2fsprogs/BSD-LICENSE"
|
||||||
add_file "/usr/share/licenses/e2fsprogs/MIT-LICENSE"
|
add_file "/usr/share/licenses/e2fsprogs/MIT-LICENSE"
|
||||||
|
|
|
@ -5,7 +5,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')"
|
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 mkreiserfs mkfs.ext2 jfs_fsck jfs_mkfs mkfs.xfs xfs_freeze xfs_io mkdosfs blkid mkntfs ntfsmount ntfs-3g mkfs.reiserfs mkfs.ext3 mkfs.ext4 mke2fs mkfs.jfs mkfs.ntfs mount.ntfs-fuse mount.fuse.ntfs mount.ntfs-3g mkfs.vfat mkfs.msdos"
|
BINARIES="mkswap mkreiserfs mkfs.ext2 jfs_fsck jfs_mkfs mkfs.xfs xfs_freeze xfs_io mkdosfs blkid mkntfs ntfsmount ntfs-3g mkfs.reiserfs mkfs.ext3 mkfs.ext4 mke2fs mkfs.jfs mkfs.ntfs mount.ntfs-fuse mount.fuse.ntfs mount.ntfs-3g mkfs.vfat mkfs.msdos"
|
||||||
FILES=""
|
FILES=""
|
||||||
SCRIPT="arch_filesystems_lowmem"
|
SCRIPT=""
|
||||||
# fix licenses
|
# fix licenses
|
||||||
add_file "/usr/share/licenses/e2fsprogs/BSD-LICENSE"
|
add_file "/usr/share/licenses/e2fsprogs/BSD-LICENSE"
|
||||||
add_file "/usr/share/licenses/e2fsprogs/MIT-LICENSE"
|
add_file "/usr/share/licenses/e2fsprogs/MIT-LICENSE"
|
||||||
|
|
Loading…
Reference in a new issue