Mount "usr/share" and "lib/modules" in aufs stack instead of bind mount.
Otherwise these paths are read-only. Fixes FS#19149 Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
parent
e684241e0e
commit
3311f176a0
@ -119,14 +119,15 @@ mksquashfs_image() {
|
||||
|
||||
usrshare_copy_from_root_image() {
|
||||
echo "Executing: ${FUNCNAME}"
|
||||
cp -a ${work_dir}/tmp/i686/root-image/usr/share ${work_dir}/tmp/any/usrshare
|
||||
mkdir -p ${work_dir}/tmp/any/usrshare/usr
|
||||
cp -a ${work_dir}/tmp/i686/root-image/usr/share ${work_dir}/tmp/any/usrshare/usr
|
||||
}
|
||||
|
||||
usrshare_purge() {
|
||||
echo "Executing: ${FUNCNAME}"
|
||||
rm -rf ${work_dir}/tmp/any/usrshare/man
|
||||
rm -rf ${work_dir}/tmp/any/usrshare/info
|
||||
rm -rf ${work_dir}/tmp/any/usrshare/doc
|
||||
rm -rf ${work_dir}/tmp/any/usrshare/usr/share/man
|
||||
rm -rf ${work_dir}/tmp/any/usrshare/usr/share/info
|
||||
rm -rf ${work_dir}/tmp/any/usrshare/usr/share/doc
|
||||
}
|
||||
|
||||
usrshare_make_image() {
|
||||
@ -144,7 +145,8 @@ libmodules_make_image() {
|
||||
libmodules_copy_from_root_image() {
|
||||
echo "Executing: ${FUNCNAME}"
|
||||
for _arch in i686 x86_64; do
|
||||
cp -a ${work_dir}/tmp/${_arch}/root-image/lib/modules ${work_dir}/tmp/${_arch}/libmodules
|
||||
mkdir -p ${work_dir}/tmp/${_arch}/libmodules/lib
|
||||
cp -a ${work_dir}/tmp/${_arch}/root-image/lib/modules ${work_dir}/tmp/${_arch}/libmodules/lib
|
||||
done
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
i686/overlay.sqfs i686 / squashfs
|
||||
i686/core-pkgs.sqfs i686 /src/core/pkg squashfs
|
||||
any/usrshare.sqfs i686 /usr/share squashfs
|
||||
i686/libmodules.sqfs i686 /lib/modules squashfs
|
||||
any/usrshare.sqfs i686 / squashfs
|
||||
i686/libmodules.sqfs i686 / squashfs
|
||||
i686/root-image.sqfs i686 / squashfs
|
||||
|
@ -1,5 +1,5 @@
|
||||
x86_64/overlay.sqfs x86_64 / squashfs
|
||||
x86_64/core-pkgs.sqfs x86_64 /src/core/pkg squashfs
|
||||
any/usrshare.sqfs x86_64 /usr/share squashfs
|
||||
x86_64/libmodules.sqfs x86_64 /lib/modules squashfs
|
||||
any/usrshare.sqfs x86_64 / squashfs
|
||||
x86_64/libmodules.sqfs x86_64 / squashfs
|
||||
x86_64/root-image.sqfs x86_64 / squashfs
|
||||
|
@ -1,5 +1,5 @@
|
||||
x86_64/overlay.sqfs x86_64 / squashfs
|
||||
x86_64/core-pkgs.sqfs x86_64 /src/core/pkg squashfs
|
||||
any/usrshare.sqfs x86_64 /usr/share squashfs
|
||||
x86_64/libmodules.sqfs x86_64 /lib/modules squashfs
|
||||
any/usrshare.sqfs x86_64 / squashfs
|
||||
x86_64/libmodules.sqfs x86_64 / squashfs
|
||||
i686/root-image.sqfs x86_64 / squashfs
|
||||
|
Loading…
Reference in New Issue
Block a user