Commit bb84aa78 authored by Thomas Bächler's avatar Thomas Bächler Committed by Gerardo Exequiel Pozzi
Browse files

Adjust for /lib/modules -> /usr/lib/modules move



Although everything should be fine now (due to the /lib -> /usr/lib symlink),
adjust everything to the proper path.

Edited (Gerardo): Also rename function name and image name to be consisten.
Signed-off-by: Pierre Schmitz's avatarPierre Schmitz <pierre@archlinux.de>
Signed-off-by: default avatarGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
parent 6327470e
# <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size>
root-image / %ARCH% xz ext4 50%
lib-modules /lib/modules %ARCH% xz ext4 50%
usr-lib-modules /usr/lib/modules %ARCH% xz ext4 50%
usr-share /usr/share any xz ext4 50%
repo-core-%ARCH% /repo/core/%ARCH% %ARCH% xz none 0
repo-core-any /repo/core/any any xz none 0
# <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size>
root-image / %ARCH% xz ext4 50%
lib-modules /lib/modules %ARCH% xz ext4 50%
usr-lib-modules /usr/lib/modules %ARCH% xz ext4 50%
usr-share /usr/share any xz ext4 50%
......@@ -121,7 +121,7 @@ make_syslinux() {
cp ${_src_syslinux}/memdisk ${_dst_syslinux}
mkdir -p ${_dst_syslinux}/hdt
cat ${work_dir}/root-image/usr/share/hwdata/pci.ids | gzip -9 > ${_dst_syslinux}/hdt/pciids.gz
cat ${work_dir}/root-image/lib/modules/*-ARCH/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz
cat ${work_dir}/root-image/usr/lib/modules/*-ARCH/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz
: > ${work_dir}/build.${FUNCNAME}
fi
}
......@@ -157,10 +157,10 @@ make_customize_root_image() {
fi
}
# Split out /lib/modules from root-image (makes more "dual-iso" friendly)
make_lib_modules() {
# Split out /usr/lib/modules from root-image (makes more "dual-iso" friendly)
make_usr_lib_modules() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
mv ${work_dir}/root-image/lib/modules ${work_dir}/lib-modules
mv ${work_dir}/root-image/usr/lib/modules ${work_dir}/usr-lib-modules
: > ${work_dir}/build.${FUNCNAME}
fi
}
......@@ -322,7 +322,7 @@ make_common_single() {
make_syslinux
make_isolinux
make_customize_root_image
make_lib_modules
make_usr_lib_modules
make_usr_share
make_aitab $1
make_prepare $1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment