zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Account for the change in umount command in LFS

Browse source 
The command for unmounting the kernel vfs is now
  umount -Rv $LFS
So we have first to use that command in teardown (change in
kernfs.xsl). Second, since the command tries to umount
$LFS, but the Makefile is on $LFS, it fails. Ignore the
error in the Makefile (change in master.sh)
This commit is contained in:
Pierre Labastie 2021-03-09 21:58:44 +01:00
parent c2af9cd73f
commit 47dfc81bdc
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LFS/master.sh
View file

@ -299,7 +299,7 @@ build_Makefile() { #
-e 's|\$\$LFS|$(MOUNT_PT)|g'` -e 's|\$\$LFS|$(MOUNT_PT)|g'`
teardown=`cat ../kernfs-scripts/teardown.sh | \ teardown=`cat ../kernfs-scripts/teardown.sh | \
sed -e 's|^| |' \ sed -e 's|^| |' \
-e 's|umount|sudo &|' \ -e 's|umount|-sudo &|' \
-e 's|\$LFS|$(MOUNT_PT)|'` -e 's|\$LFS|$(MOUNT_PT)|'`
teardownat=`cat ../kernfs-scripts/teardown.sh | \ teardownat=`cat ../kernfs-scripts/teardown.sh | \
sed -e 's|^| |' \ sed -e 's|^| |' \

3
common/kernfs.xsl
View file

@ -11,7 +11,8 @@
<xsl:template match="/"> <xsl:template match="/">
<xsl:apply-templates select="//userinput[contains(string(),'--bind') or <xsl:apply-templates select="//userinput[contains(string(),'--bind') or
contains(string(),'/proc') or contains(string(),'/proc') or
contains(string(),'readlink')]"/> contains(string(),'readlink') or
contains(string(),'-Rv')]"/>
</xsl:template> </xsl:template>
<xsl:template match="userinput"> <xsl:template match="userinput">