pygos/build
1
0
Fork 0
mirror of https://github.com/pygos/build.git synced 2024-11-22 19:19:46 +01:00
Code Issues Releases Wiki Activity

Revamp/improve vfs setup in initrd

Browse source 
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-02-05 11:35:21 +01:00
parent 86f9c7ba87
commit dec32445a1
3 changed files with 58 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cfg/alix/bbstatic.config
View file

@ -452,10 +452,10 @@ CONFIG_FEATURE_ALLOW_EXEC=y
# CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_REGEX is not set
# CONFIG_FEATURE_FIND_CONTEXT is not set # CONFIG_FEATURE_FIND_CONTEXT is not set
# CONFIG_FEATURE_FIND_LINKS is not set # CONFIG_FEATURE_FIND_LINKS is not set
# CONFIG_GREP is not set CONFIG_GREP=y
# CONFIG_EGREP is not set # CONFIG_EGREP is not set
# CONFIG_FGREP is not set # CONFIG_FGREP is not set
# CONFIG_FEATURE_GREP_CONTEXT is not set CONFIG_FEATURE_GREP_CONTEXT=y
# CONFIG_XARGS is not set # CONFIG_XARGS is not set
# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set

4
cfg/rpi3/bbstatic.config
View file

@ -451,10 +451,10 @@ CONFIG_FEATURE_ALLOW_EXEC=y
# CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_REGEX is not set
# CONFIG_FEATURE_FIND_CONTEXT is not set # CONFIG_FEATURE_FIND_CONTEXT is not set
# CONFIG_FEATURE_FIND_LINKS is not set # CONFIG_FEATURE_FIND_LINKS is not set
# CONFIG_GREP is not set CONFIG_GREP=y
# CONFIG_EGREP is not set # CONFIG_EGREP is not set
# CONFIG_FGREP is not set # CONFIG_FGREP is not set
# CONFIG_FEATURE_GREP_CONTEXT is not set CONFIG_FEATURE_GREP_CONTEXT=y
# CONFIG_XARGS is not set # CONFIG_XARGS is not set
# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set

57
pkg/initrd/initrd.skel
View file

@ -59,6 +59,59 @@ bind_mount() {
mount --bind /newroot/${1} /newroot/${2} mount --bind /newroot/${1} /newroot/${2}
} }
setup_vfs() {
local root=${1}
mount -t proc proc $root/proc
mount -t sysfs sysfs $root/sys
mount -t devtmpfs none $root/dev
# setup /dev
[ -e $root/dev/fd ] || ln -snf /proc/self/fd $root/dev/fd
[ -e $root/dev/stdin ] || ln -snf /proc/self/fd/0 $root/dev/stdin
[ -e $root/dev/stdout ] || ln -snf /proc/self/fd/1 $root/dev/stdout
[ -e $root/dev/stderr ] || ln -snf /proc/self/fd/2 $root/dev/stderr
[ -e $root/proc/kcore ] && ln -snf /proc/kcore $root/dev/core
for x in \
"mqueue dev/mqueue 1777 ,nodev mqueue" \
"devpts dev/pts 0755 ,gid=5,mode=0620 devpts" \
"tmpfs dev/shm 1777 ,nodev,mode=1777 shm" \
; do
set -- $x
grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue
if [ ! -d "$root/$2" ]; then
mkdir -m $3 -p "$root/$2" >/dev/null 2>&1 || \
echo "Could not create $root/$2!"
fi
if [ -d "$root/$2" ]; then
mount -t $1 -o noexec,nosuid$4 $5 "$root/$2"
fi
done
# set up additional mounts in /proc and /sys
for x in \
"sys/kernel/security securityfs nodev,noexec,nosuid" \
"sys/kernel/config configfs nodev,noexec,nosuid" \
"sys/fs/fuse/connections fusectl nodev,noexec,nosuid" \
"sys/firmware/efi/efivars efivarfs ro" \
"proc/sys/fs/binfmt_misc binfmt_misc nodev,noexec,nosuid" \
; do
set -- $x
if [ -d "$root/$1" ]; then
if grep -qs $2 "$root/proc/filesystems"; then
echo "Mounting $2 filesystem"
mount -n -t $2 -o $3 $2 "$root/$1"
fi
fi
done
unset -v x
}
mount ${root} /images mount ${root} /images
if [ ! -e /images/${root_sfs} ]; then if [ ! -e /images/${root_sfs} ]; then
@ -68,9 +121,7 @@ if [ ! -e /images/${root_sfs} ]; then
fi fi
mount -t squashfs /images/${root_sfs} /newroot mount -t squashfs /images/${root_sfs} /newroot
mount -t devtmpfs none /newroot/dev setup_vfs "/newroot"
mount -t proc proc /newroot/proc
mount -t sysfs sysfs /newroot/sys
mount -t tmpfs none /newroot/tmp mount -t tmpfs none /newroot/tmp
mount -t tmpfs none /newroot/var mount -t tmpfs none /newroot/var
mount -t tmpfs none /newroot/run mount -t tmpfs none /newroot/run