On Tue, Nov 16, 2010 at 9:52 AM, Garrett Cooper <gcoo...@freebsd.org> wrote:
> On Tue, Nov 16, 2010 at 6:12 AM, John Baldwin <j...@freebsd.org> wrote:
>> On Tuesday, November 16, 2010 8:45:08 am Andrey V. Elsukov wrote:
>>> On 16.11.2010 16:29, John Baldwin wrote:
>>> > Err, are there no longer hard links to all of the frontends for a given
>>> > crunch? If so, that is a problem as it will make rescue much harder to
>>> > use.
>>>
>>> Yes, probably this patch is not needed and it should be fixed somewhere in
>>> makefiles. But currently rescue does not have any hardlinks:
>>> http://pub.allbsd.org/FreeBSD-snapshots/i386-i386/9.0-HEAD-20101116-JPSNAP/cdrom/livefs/rescue/
>>>
>>> And what is was before:
>>> http://pub.allbsd.org/FreeBSD-snapshots/i386-i386/9.0-HEAD-20101112-JPSNAP/cdrom/livefs/rescue/
>>
>> That definitely needs to be fixed.
>
> The .mk file wasn't being installed. Could someone please test
> this patch for validity and commit it?
> More importantly, why didn't the above build process, or tinderbox
> fail properly with this change?
Ouch. I can definitely still see the other problem:
# make install
install -s -o root -g wheel -m 555 rescue /rescue
install -o root -g wheel -m 555 nextboot_FIXED /rescue/nextboot
install -o root -g wheel -m 555 dhclient_FIXED /rescue/dhclient-script
The second attached patch (not a superset of the first) what unbreaks it:
# make -C rescue/rescue/ install
install -s -o root -g wheel -m 555 rescue /rescue
install -o root -g wheel -m 555 nextboot_FIXED /rescue/nextboot
install -o root -g wheel -m 555 dhclient_FIXED /rescue/dhclient-script
/rescue/cat -> /rescue/rescue
/rescue/chflags -> /rescue/rescue
/rescue/chio -> /rescue/rescue
/rescue/chmod -> /rescue/rescue
/rescue/cp -> /rescue/rescue
/rescue/date -> /rescue/rescue
/rescue/dd -> /rescue/rescue
/rescue/df -> /rescue/rescue
/rescue/echo -> /rescue/rescue
/rescue/ed -> /rescue/rescue
/rescue/red -> /rescue/rescue
/rescue/expr -> /rescue/rescue
/rescue/getfacl -> /rescue/rescue
/rescue/hostname -> /rescue/rescue
/rescue/kenv -> /rescue/rescue
/rescue/kill -> /rescue/rescue
/rescue/ln -> /rescue/rescue
/rescue/link -> /rescue/rescue
/rescue/ls -> /rescue/rescue
/rescue/mkdir -> /rescue/rescue
/rescue/mv -> /rescue/rescue
/rescue/pkill -> /rescue/rescue
/rescue/pgrep -> /rescue/rescue
/rescue/ps -> /rescue/rescue
/rescue/pwd -> /rescue/rescue
/rescue/realpath -> /rescue/rescue
/rescue/rm -> /rescue/rescue
/rescue/unlink -> /rescue/rescue
/rescue/rmdir -> /rescue/rescue
/rescue/setfacl -> /rescue/rescue
/rescue/sh -> /rescue/rescue
/rescue/stty -> /rescue/rescue
/rescue/sync -> /rescue/rescue
/rescue/test -> /rescue/rescue
/rescue/[ -> /rescue/rescue
/rescue/csh -> /rescue/rescue
/rescue/tcsh -> /rescue/rescue
/rescue/atacontrol -> /rescue/rescue
/rescue/badsect -> /rescue/rescue
/rescue/camcontrol -> /rescue/rescue
/rescue/ccdconfig -> /rescue/rescue
/rescue/clri -> /rescue/rescue
/rescue/devfs -> /rescue/rescue
/rescue/dmesg -> /rescue/rescue
/rescue/dump -> /rescue/rescue
/rescue/rdump -> /rescue/rescue
/rescue/dumpfs -> /rescue/rescue
/rescue/dumpon -> /rescue/rescue
/rescue/fsck -> /rescue/rescue
/rescue/fsck_ffs -> /rescue/rescue
/rescue/fsck_4.2bsd -> /rescue/rescue
/rescue/fsck_ufs -> /rescue/rescue
/rescue/fsck_msdosfs -> /rescue/rescue
/rescue/fsdb -> /rescue/rescue
/rescue/fsirand -> /rescue/rescue
/rescue/gbde -> /rescue/rescue
/rescue/geom -> /rescue/rescue
/rescue/glabel -> /rescue/rescue
/rescue/gpart -> /rescue/rescue
/rescue/ifconfig -> /rescue/rescue
/rescue/init -> /rescue/rescue
/rescue/kldconfig -> /rescue/rescue
/rescue/kldload -> /rescue/rescue
/rescue/kldstat -> /rescue/rescue
/rescue/kldunload -> /rescue/rescue
/rescue/ldconfig -> /rescue/rescue
/rescue/md5 -> /rescue/rescue
/rescue/mdconfig -> /rescue/rescue
/rescue/mdmfs -> /rescue/rescue
/rescue/mknod -> /rescue/rescue
/rescue/mount -> /rescue/rescue
/rescue/mount_cd9660 -> /rescue/rescue
/rescue/mount_msdosfs -> /rescue/rescue
/rescue/mount_nfs -> /rescue/rescue
/rescue/mount_ntfs -> /rescue/rescue
/rescue/mount_nullfs -> /rescue/rescue
/rescue/mount_udf -> /rescue/rescue
/rescue/mount_unionfs -> /rescue/rescue
/rescue/newfs -> /rescue/rescue
/rescue/newfs_msdos -> /rescue/rescue
/rescue/nos-tun -> /rescue/rescue
/rescue/ping -> /rescue/rescue
/rescue/reboot -> /rescue/rescue
/rescue/fastboot -> /rescue/rescue
/rescue/halt -> /rescue/rescue
/rescue/fasthalt -> /rescue/rescue
/rescue/restore -> /rescue/rescue
/rescue/rrestore -> /rescue/rescue
/rescue/rcorder -> /rescue/rescue
/rescue/route -> /rescue/rescue
/rescue/routed -> /rescue/rescue
/rescue/rtquery -> /rescue/rescue
/rescue/rtsol -> /rescue/rescue
/rescue/savecore -> /rescue/rescue
/rescue/spppcontrol -> /rescue/rescue
/rescue/swapon -> /rescue/rescue
/rescue/sysctl -> /rescue/rescue
/rescue/tunefs -> /rescue/rescue
/rescue/umount -> /rescue/rescue
/rescue/bsdlabel -> /rescue/rescue
/rescue/disklabel -> /rescue/rescue
/rescue/fdisk -> /rescue/rescue
/rescue/dhclient -> /rescue/rescue
/rescue/head -> /rescue/rescue
/rescue/mt -> /rescue/rescue
/rescue/sed -> /rescue/rescue
/rescue/tail -> /rescue/rescue
/rescue/tee -> /rescue/rescue
/rescue/gzip -> /rescue/rescue
/rescue/gunzip -> /rescue/rescue
/rescue/gzcat -> /rescue/rescue
/rescue/zcat -> /rescue/rescue
/rescue/bzip2 -> /rescue/rescue
/rescue/bunzip2 -> /rescue/rescue
/rescue/bzcat -> /rescue/rescue
/rescue/xz -> /rescue/rescue
/rescue/unxz -> /rescue/rescue
/rescue/lzma -> /rescue/rescue
/rescue/unlzma -> /rescue/rescue
/rescue/xzcat -> /rescue/rescue
/rescue/lzcat -> /rescue/rescue
/rescue/tar -> /rescue/rescue
/rescue/vi -> /rescue/rescue
/rescue/ex -> /rescue/rescue
/rescue/id -> /rescue/rescue
/rescue/groups -> /rescue/rescue
/rescue/whoami -> /rescue/rescue
/rescue/chroot -> /rescue/rescue
/rescue/chown -> /rescue/rescue
/rescue/chgrp -> /rescue/rescue
So it looks like something tunable needs to be added to the .mk file
to deal with hardlinks as this basically reenables functionality that
Adrian disabled.
Thanks,
-Garrett
Index: share/mk/bsd.crunchgen.mk
===================================================================
--- share/mk/bsd.crunchgen.mk (revision 215333)
+++ share/mk/bsd.crunchgen.mk (working copy)
@@ -51,19 +51,16 @@
.else
$(OUTPUTS): $(.CURDIR)/../../$(D)/$(P)/Makefile
.endif
-# Disable building links for bsdbox - whatever is installing the binaries into
-# the embedded system should (for now) do the linking there. This may change
-# in the future. -adrian
-#.ifndef CRUNCH_SUPPRESS_LINK_${P}
-#LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(P)
-#.endif
-#.for A in $(CRUNCH_ALIAS_$(P))
-#.ifndef CRUNCH_SUPPRESS_LINK_${A}
-#LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(A)
-#.endif
-#.endfor
+.ifndef CRUNCH_SUPPRESS_LINK_${P}
+LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(P)
+.endif
+.for A in $(CRUNCH_ALIAS_$(P))
+.ifndef CRUNCH_SUPPRESS_LINK_${A}
+LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(A)
+.endif
.endfor
.endfor
+.endfor
all: $(PROG)
exe: $(PROG)
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
