mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
'fix ext4 support'
This commit is contained in:
parent
c4fc14874b
commit
e0f227d001
2 changed files with 25 additions and 7 deletions
|
@ -1,10 +1,22 @@
|
||||||
[defaults]
|
[defaults]
|
||||||
base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
|
base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
|
||||||
blocksize = 4096
|
blocksize = 4096
|
||||||
inode_size = 128
|
inode_size = 256
|
||||||
inode_ratio = 16384
|
inode_ratio = 16384
|
||||||
|
|
||||||
[fs_types]
|
[fs_types]
|
||||||
|
ext3 = {
|
||||||
|
features = has_journal
|
||||||
|
}
|
||||||
|
ext4 = {
|
||||||
|
features = has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
|
||||||
|
inode_size = 256
|
||||||
|
}
|
||||||
|
ext4dev = {
|
||||||
|
features = has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
|
||||||
|
inode_size = 256
|
||||||
|
options = test_fs=1
|
||||||
|
}
|
||||||
small = {
|
small = {
|
||||||
blocksize = 1024
|
blocksize = 1024
|
||||||
inode_size = 128
|
inode_size = 128
|
||||||
|
@ -20,7 +32,13 @@
|
||||||
}
|
}
|
||||||
largefile = {
|
largefile = {
|
||||||
inode_ratio = 1048576
|
inode_ratio = 1048576
|
||||||
|
blocksize = -1
|
||||||
}
|
}
|
||||||
largefile4 = {
|
largefile4 = {
|
||||||
inode_ratio = 4194304
|
inode_ratio = 4194304
|
||||||
|
blocksize = -1
|
||||||
|
}
|
||||||
|
hurd = {
|
||||||
|
blocksize = 4096
|
||||||
|
inode_size = 128
|
||||||
}
|
}
|
||||||
|
|
|
@ -1199,9 +1199,9 @@ dolilo() {
|
||||||
if [ -n "${_uuid}" ]; then
|
if [ -n "${_uuid}" ]; then
|
||||||
_rootpart="/dev/disk/by-uuid/${_uuid}"
|
_rootpart="/dev/disk/by-uuid/${_uuid}"
|
||||||
fi
|
fi
|
||||||
sed -i "s|root=.*$|append=\"root=${_rootpart} rootfs=$ROOTFS\"|g" $DESTDIR/etc/lilo.conf
|
sed -i "s|root=.*$|append=\"root=${_rootpart} rootfstype=$ROOTFS\"|g" $DESTDIR/etc/lilo.conf
|
||||||
else
|
else
|
||||||
sed -i "s|root=.*$|append=\"root=${PART_ROOT} rootfs=$ROOTFS\"|g" $DESTDIR/etc/lilo.conf
|
sed -i "s|root=.*$|append=\"root=${PART_ROOT} rootfstype=$ROOTFS\"|g" $DESTDIR/etc/lilo.conf
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
DEVS=$(finddisks _)
|
DEVS=$(finddisks _)
|
||||||
|
@ -1269,9 +1269,9 @@ dogrub() {
|
||||||
fi
|
fi
|
||||||
echo "root $grubdev" >>$DESTDIR/boot/grub/menu.lst
|
echo "root $grubdev" >>$DESTDIR/boot/grub/menu.lst
|
||||||
if [ "$UUIDPARAMETER" = "yes" ]; then
|
if [ "$UUIDPARAMETER" = "yes" ]; then
|
||||||
echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootfs=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
|
echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootfstype=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
|
||||||
else
|
else
|
||||||
echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootfs=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
|
echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootfstype=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
|
||||||
fi
|
fi
|
||||||
if [ "$VMLINUZ" = "vmlinuz26" ]; then
|
if [ "$VMLINUZ" = "vmlinuz26" ]; then
|
||||||
echo "initrd $subdir/kernel26.img" >>$DESTDIR/boot/grub/menu.lst
|
echo "initrd $subdir/kernel26.img" >>$DESTDIR/boot/grub/menu.lst
|
||||||
|
@ -1282,9 +1282,9 @@ dogrub() {
|
||||||
echo "title Arch Linux Fallback" >>$DESTDIR/boot/grub/menu.lst
|
echo "title Arch Linux Fallback" >>$DESTDIR/boot/grub/menu.lst
|
||||||
echo "root $grubdev" >>$DESTDIR/boot/grub/menu.lst
|
echo "root $grubdev" >>$DESTDIR/boot/grub/menu.lst
|
||||||
if [ "$UUIDPARAMETER" = "yes" ]; then
|
if [ "$UUIDPARAMETER" = "yes" ]; then
|
||||||
echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootfs=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
|
echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootfstype=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
|
||||||
else
|
else
|
||||||
echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootfs=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
|
echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootfstype=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
|
||||||
fi
|
fi
|
||||||
if [ "$VMLINUZ" = "vmlinuz26" ]; then
|
if [ "$VMLINUZ" = "vmlinuz26" ]; then
|
||||||
echo "initrd $subdir/kernel26-fallback.img" >>$DESTDIR/boot/grub/menu.lst
|
echo "initrd $subdir/kernel26-fallback.img" >>$DESTDIR/boot/grub/menu.lst
|
||||||
|
|
Loading…
Reference in a new issue