Date: Sat, 17 Jun 1995 12:19:45 -0400 (EDT) From: "Adrian T. Filipi-Martin" <atf3r@server.cs.virginia.edu> To: bugs@freebsd.org Subject: /usr/src/bin Message-ID: <Pine.SUN.3.90.950617103538.10244A-100000@larc.cs.Virginia.edu>
next in thread | raw e-mail | index | archive | help
Hi folks,
Unless I am hallucinating, 2.0.5-RELEASE does not install the
sources for /bin. I checked the release/sysinstall/dist.{h,c} files, and
find no mention of sbin.* in the source distributions section. The
oversight seems to have carried over to menu.c as well.
It appears that by adding a single line to menu.c, dist.h and
dist.c for the sbin distribution fixes the problem. Appended is a small
diff of what I changed. Note that I also made a couple of minor changes
to install.c, such that sysinstall could safely be run at a later time to
add distributions without destroying your devices or extracting the
root.flp. These latter changes are not thoroughly thought through, so
work still needs to be done to make sysinstall safe.
BTW, the release sources also have object files packed in there.
They survive a 'make cleandist', so this is probably the root of the problem.
cheers,
Adrian
adrian@virginia.edu ---->>>>| Support your local programmer,
http://www.cs.virginia.edu/~atf3r/ --->>>| STOP Software Patent Abuses NOW!
Member: The League for -->>| info at ftp.uu.net:/doc/lpf, print
Programming Freedom ->| "join.ps.Z" for an application
--------------------------------------------------------------
diff -cr release/sysinstall/dist.c release.new/sysinstall/dist.c
*** release/sysinstall/dist.c Sat Jun 10 05:35:49 1995
--- release.new/sysinstall/dist.c Sat Jun 17 10:50:13 1995
***************
*** 104,109 ****
--- 104,110 ----
{ "slibexec", "/usr/src", &SrcDists, DIST_SRC_LIBEXEC, NULL },
{ "slkm", "/usr/src", &SrcDists, DIST_SRC_LKM, NULL },
{ "srelease", "/usr/src", &SrcDists, DIST_SRC_RELEASE, NULL },
+ { "sbin", "/usr/src", &SrcDists, DIST_SRC_BIN, NULL },
{ "ssbin", "/usr/src", &SrcDists, DIST_SRC_SBIN, NULL },
{ "sshare", "/usr/src", &SrcDists, DIST_SRC_SHARE, NULL },
{ "ssys", "/usr/src", &SrcDists, DIST_SRC_SYS, NULL },
diff -cr release/sysinstall/dist.h release.new/sysinstall/dist.h
*** release/sysinstall/dist.h Sat Jun 10 04:59:20 1995
--- release.new/sysinstall/dist.h Sat Jun 17 10:48:59 1995
***************
*** 46,51 ****
--- 46,52 ----
#define DIST_SRC_SYS 0x0800
#define DIST_SRC_UBIN 0x1000
#define DIST_SRC_USBIN 0x2000
+ #define DIST_SRC_BIN 0x4000
#define DIST_SRC_ALL 0xFFFF
/* Subtypes for XFree86 distribution */
diff -cr release/sysinstall/install.c release.new/sysinstall/install.c
*** release/sysinstall/install.c Sat Jun 10 03:58:37 1995
--- release.new/sysinstall/install.c Sat Jun 17 11:39:17 1995
***************
*** 271,277 ****
return 0;
configFstab();
}
! if (!SystemWasInstalled && !root_extract()) {
msgConfirm("Failed to load the ROOT distribution. Please correct\nthis problem and try again.");
return 0;
}
--- 271,277 ----
return 0;
configFstab();
}
! if (RunningAsInit && !SystemWasInstalled && !root_extract()) {
msgConfirm("Failed to load the ROOT distribution. Please correct\nthis problem and try again.");
return 0;
}
***************
*** 290,296 ****
}
/* Resurrect /dev after bin distribution screws it up */
! if (!SystemWasInstalled) {
msgNotify("Remaking all devices.. Please wait!");
if (vsystem("cd /dev; sh MAKEDEV all"))
msgConfirm("MAKEDEV returned non-zero status");
--- 290,296 ----
}
/* Resurrect /dev after bin distribution screws it up */
! if (RunningAsInit && !SystemWasInstalled) {
msgNotify("Remaking all devices.. Please wait!");
if (vsystem("cd /dev; sh MAKEDEV all"))
msgConfirm("MAKEDEV returned non-zero status");
diff -cr release/sysinstall/menus.c release.new/sysinstall/menus.c
*** release/sysinstall/menus.c Sat Jun 10 04:59:24 1995
--- release.new/sysinstall/menus.c Sat Jun 17 11:19:55 1995
***************
*** 457,462 ****
--- 457,464 ----
DMENU_SET_FLAG, &SrcDists, DIST_SRC_LKM, 0, dmenuFlagCheck },
{ "release", "/usr/src/release (release-generation tools) [533K]",
DMENU_SET_FLAG, &SrcDists, DIST_SRC_RELEASE, 0, dmenuFlagCheck },
+ { "bin", "/usr/src/bin (system binaries) [???MB]",
+ DMENU_SET_FLAG, &SrcDists, DIST_SRC_BIN, 0, dmenuFlagCheck },
{ "sbin", "/usr/src/sbin (system binaries) [1.3MB]",
DMENU_SET_FLAG, &SrcDists, DIST_SRC_SBIN, 0, dmenuFlagCheck },
{ "share", "/usr/src/share (documents and shared files) [10MB]",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.SUN.3.90.950617103538.10244A-100000>