Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl 2024-02-05 00:30:17 +01:00
commit ce6d8f67f6
2 changed files with 3 additions and 3 deletions

View File

@ -100,7 +100,7 @@ mount -vt tmpfs tmpfs $LFS/run</userinput></screen>
symbolic link to a directory, typically symbolic link to a directory, typically
<filename class="directory">/run/shm</filename>. <filename class="directory">/run/shm</filename>.
The /run tmpfs was mounted above so in this case only a The /run tmpfs was mounted above so in this case only a
directory needs to be created.</para> directory needs to be created with the correct permissions.</para>
<para>In other host systems <filename>/dev/shm</filename> is a mount point <para>In other host systems <filename>/dev/shm</filename> is a mount point
for a tmpfs. In that case the mount of /dev above will only create for a tmpfs. In that case the mount of /dev above will only create
@ -108,7 +108,7 @@ mount -vt tmpfs tmpfs $LFS/run</userinput></screen>
we must explicitly mount a tmpfs:</para> we must explicitly mount a tmpfs:</para>
<screen><userinput>if [ -h $LFS/dev/shm ]; then <screen><userinput>if [ -h $LFS/dev/shm ]; then
mkdir -pv $LFS$(realpath /dev/shm) install -v -d -m 1777 $LFS$(realpath /dev/shm)
else else
mount -vt tmpfs -o nosuid,nodev tmpfs $LFS/dev/shm mount -vt tmpfs -o nosuid,nodev tmpfs $LFS/dev/shm
fi</userinput></screen> fi</userinput></screen>

View File

@ -130,7 +130,7 @@ mounttype proc proc proc
mounttype sys sysfs sysfs mounttype sys sysfs sysfs
mounttype run tmpfs run mounttype run tmpfs run
if [ -h $LFS/dev/shm ]; then if [ -h $LFS/dev/shm ]; then
mkdir -pv $LFS$(realpath /dev/shm) install -v -d -m 1777 $LFS$(realpath /dev/shm)
else else
mounttype dev/shm tmpfs tmpfs -o nosuid,nodev mounttype dev/shm tmpfs tmpfs -o nosuid,nodev
fi fi