Pierre Labastie wrote:
> Hi,
>
> The file /mnt/lfs/jhalfs/lfs-commands/chapter06/087-procps-ng
> contains:
> [...]
> pushd testsuite
> sed -i 's|exec which sleep|exec echo /tools/bin/sleep|' config/unix.exp
> sed -i 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp
> make site.exp
> DEJAGNU=global-conf.exp runtest
> popd >> $TEST_LOG 2>&1
> [...]
> This is not what is wanted I guess...
> I attach a patch which creates :
> { pushd testsuite
> sed -i 's|exec which sleep|exec echo /tools/bin/sleep|' config/unix.exp
> sed -i 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp
> make site.exp
> DEJAGNU=global-conf.exp runtest
> popd; } >> $TEST_LOG 2>&1
>
> The last line has an additional || true if we should not stop on errors.
Yes, I've been doing that manually. Alternatively I've been doing:
pushd testsuite
sed -i 's|exec which sleep|exec echo /tools/bin/sleep|' config/unix.exp
sed -i 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp
make site.exp >> $TEST_LOG 2>&1
DEJAGNU=global-conf.exp runtest >> $TEST_LOG 2>&1 || true
popd
> Let me know if I should commit it
Yes, please do.
There is another issue that I've changed manually:
--- LFS/master.sh (revision 3635)
+++ LFS/master.sh (working copy)
@@ -512,14 +512,14 @@
devices: ck_LFS ck_UID
sudo mount -v --bind /dev \$(LFS)/dev
sudo mount -vt devpts devpts \$(LFS)/dev/pts
- sudo mount -vt tmpfs shm \$(LFS)/dev/shm
+ sudo mount -vt tmpfs shm \$(LFS)/run/shm
sudo mount -vt proc proc \$(LFS)/proc
sudo mount -vt sysfs sysfs \$(LFS)/sys
teardown: ck_LFS
sudo umount -v \$(LFS)/sys
sudo umount -v \$(LFS)/proc
- sudo umount -v \$(LFS)/dev/shm
+ sudo umount -v \$(LFS)/run/shm
sudo umount -v \$(LFS)/dev/pts
sudo umount -v \$(LFS)/dev
@@ -561,7 +561,7 @@
do_housekeeping:
@-umount \$(MOUNT_PT)/sys
@-umount \$(MOUNT_PT)/proc
- @-umount \$(MOUNT_PT)/dev/shm
+ @-umount \$(MOUNT_PT)/run/shm
@-umount \$(MOUNT_PT)/dev/pts
@-umount \$(MOUNT_PT)/dev
@-rm /tools
The problem is in the umount command. The mount works because of the
symlink from /dev/shm->/run/shm.
CLFS/master.sh and HLFS/master.sh may need to be changed in a similar
manner, but I don't use those.
-- Bruce
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
