Commit Graph

1135 Commits

Author SHA1 Message Date
jhb
dc23a6cc29 - Rename installFixupBin to installFixupBase to finish up the 'bin' to
'base' dist rename.
- Rework struct dist to allow for different types of dists.  There are
  currently three types of dists: DT_TARBALL, the traditonal gzipped and
  split tar file; DT_PACKAGE, a package; and DT_SUBDIST, a meta-dist in
  the tree that has its own array of dists as its contents.  For example,
  the 'base' dist is a DT_TARBALL dist, the 'perl' dist is a DT_PACKAGE
  dist, and the 'src' dist is a DT_SUBDIST dist with its own dist table
  that contains 'sbase', 'ssys', etc.
- Add helper macros for defining array entries for the different types of
  dists to try and make the statically defined dist table in dist.c more
  readable.
- Split the logic to deal with a DT_TARBALL dist out of distExtract()
  and into its own distExtractTarball() function.  distExtract() now
  calls other functions to extract each dist.
- Tweak the percentage complete calculation in distExtractTarball() to
  do the multiply prior to the divide so it doesn't have to use floating
  point.
- Axe the installPackage() function along with the special handling for
  the perl and XFree86 dists in distExtractAll() since distExtract()
  handles package dists directly now.
- Add back in subdists for the X packages based on the split up packages
  that XFree86-4 uses that as closely map to the X dists we used with
  X 3.3.x.
- Lots of things like distSetX() and the X dist masks are no longer
  #ifndef X_AS_PKG since we use them in both cases now.
- Make the entire installFixupXFree() function #ifndef X_AS_PKG, we only
  call it in that case anyways, and it's not suitable for the X_AS_PKG
  case.
- Add in X dist menus for the X_AS_PKG case.

Approved by:	re
2003-01-17 19:05:32 +00:00
jhb
e4bbc64e1d Add 'vlan' as a network device.
Tested by:	dcs
2003-01-17 18:51:21 +00:00
jhb
8234b5cd64 Add a function driverFloppyCheck() that asks the user if they would like to
load drivers from the driver floppy if the "driver_floppy" variable is set
in the kernel environment and call this function after probing devices but
before displaying the main menu.

X-MFC after:	as soon as I finish committing to current
Approved by:	re@ (blanket)
2003-01-15 21:47:36 +00:00
kuriyama
26e1430b79 If you don't create a /usr filesystem, / will need 200MB. 2003-01-13 21:57:07 +00:00
scottl
d8ff7fe878 Teach sysinstall about rpcbind, rpc.lockd, and rpc.statd. As an added
bonus, rpcbind will be enabled automatically if rpc.lockd, rpc.statd, amd,
NFS Server, or NIS is enabled.
2003-01-07 07:46:50 +00:00
obrien
77b391761d save_realloc() should use reallocf() to close memory leaks.
item_add() should use safe_realloc() as it does no error checking itself.
2003-01-06 17:11:46 +00:00
schweikh
d3367c5f5d Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.
2003-01-01 18:49:04 +00:00
rwatson
ca398224ee Since our default boot block now supports UFS1 and UFS2 even on
i386, remove the seatbelt preventing users from setting the UFS2 flag
on the root file system on i386.  This seatbelt did not exist on
other platforms.

MFC candidate.
2002-12-28 23:33:09 +00:00
dwmalone
8da6202525 Add a new ftp mirror in Ireland which offers a service over IPv6.
MFC after:      1 week
Reviewed by:	ume
2002-12-23 23:25:39 +00:00
jkh
ed9568ea61 Correct path to /usr/sbin/sysinstall for HEAD since that's where it lives now. 2002-12-20 00:10:37 +00:00
kuriyama
01b4b67a6d Update ROOT_MIN_SIZE for i386 to 118MB (and other ROOT_*_SIZE). 2002-12-15 12:05:00 +00:00
phk
a3d0cd9e0b When things get bigger than 99GB our fields run over.
Use GB from 100GB and upwards.

Approved by:	re
2002-12-11 17:36:34 +00:00
rwatson
8a993d48c8 Unhook LOMAC sysinstall twiddle for the time being: mac_lomac requires
the MAC Framework to be compiled into the kernel, and that's not
well-expressed in sysinstall.

Approved by:	re (bmah)
2002-12-09 19:06:43 +00:00
jhb
73f877334a - Use some macros to define common text between the dialog boxes to set the
type of new slices and to change the type of existing slices.  This also
  has the advantage of moving a few #ifdef PC98's up to where the macros
  are defined instead of in the middle of the code.
- Change the behavior of the 'T' option in the slice editor so that the
  default value in the dialog box is the current type of the existing
  slice rather than defaulting to changing the slice to a FreeBSD slice as
  this is more intuitive.

Approved by:	re
2002-12-05 22:10:39 +00:00
nyan
3863f249f2 Fixed a partition type for pc98 when create or change slices in the fdisk
editor.

Approved by:	re (jhb)
2002-12-04 15:07:05 +00:00
rwatson
7df36e7050 Reformulate how sysinstall handles file system options in the label
editor, in order to support specifying UFS2 as a newfs option.

(1) Support three different newfs types: NEWFS_UFS, NEWFS_MSDOS, and
    NEWFS_CUSTOM.  Don't mix up the arguments to them: you can't use
    soft updates on an msdos file system.

(2) Distinguish adding new arguments to the newfs command line from
    replacing it.  Permit the addition of new arguments by the user for
    NEWFS_UFS.  If we entirely replace the command line provided by
    sysinstall, call it NEWFS_CUSTOM.  'N' will now add additional
    arguments; 'Z' will opt to replace the newfs command line entirely,
    but will prompt the user with their current command line as a
    starting point.

(3) Construct the newfs command line dynamically based on the options
    provided by the user at label-time.  Right now, this means selecting
    UFS1 vs. UFS2, and the soft updates flag.  Drop in some variables
    to support ACLs and MAC Multilabel in the future also, but don't
    expose them now.

This provides sysinstall with the ability to do more "in band" editing
of the newfs command line, so we can provide more support for the user,
but doesn't sacrifice the ability to entirely specify the newfs command
line of the user is willing to give up on the cushiness factor.  It
also makes it easier for us to specify defaults in the future, and
define conditional behavior based on user configuration selections.
For now, we default to UFS1, and permit UFS2 to be used as the root
only on non-i386 systems.

While I was there, I dropped the default fragment and block sizes,
since newfs has much more sensible defaults now.

Reviewed by:	jhb, marcel
Approved by:	re
ia64 bits from:	marcel
2002-12-03 22:25:47 +00:00
jhb
e3f63b42b5 Oops, forgot this cosmetic tweak to the perl menu item in my previous
commit.

Approved by:	re (this is what they actually reviewed)
2002-12-03 21:02:26 +00:00
jhb
9a5da33a40 - Convert the installation of the X package to using installPackage()
rather than installX11package().
- Add a perl psuedo-dist that installs the perl package.  The perl
  distribution is selected by default when a User distribution set is
  selected.  It is not selected when a Minimal distribution set is
  selected.  The perl distribution may be toggled manually in the
  custom menu just as other distributions.

Approved by:	re
2002-12-03 19:42:30 +00:00
jhb
9a29be5ff2 Rename installX11package() to installPackage() and tweak it so that it
can be used to install any arbitrary package.

Approved by:	re
2002-12-03 19:36:12 +00:00
jhb
ffe0d35995 Fix a bug in the fdisk editor that partially masked the chunk deletion
bug fixed yesterday.  New slices created in the fdisk editor and slices
whose sub-type is changed are of type 'mbr' if their sub-type is not a
magic type, not type 'unknown'.

Approved by:	re
2002-12-03 16:09:55 +00:00
marcel
08185d6b24 ia64 specific.
o  Mount the EFI file system as msdosfs and not ufs as it's a FAT
   file system. Introduce Mount_msdos() for this to go side-by-side
   with Mount().
o  Also, since mounting is performed as a command (which means it's
   queued, sorted, lost, found and executed), we cannot create a
   directory on the file system by calling mkdir. We must make sure
   the mkdir happens after the mount. Introduce Mkdir_command() to
   allow mkdir operations to be queued, sorted, lost, found and
   executed as well.

Approved by: re (jhb, rwatson)
2002-12-02 20:15:16 +00:00
marcel
2d00e34130 ia64: make link /boot->efi/boot relative.
Approved by: re (murray)
2002-11-30 19:54:19 +00:00
jhb
4577d287de - Only declare the MBR menu for i386 that is not PC98.
- Only declare mouse menus if WITH_MICE.
- Only declare syscons menus if WITH_SYSCONS.
- Only declare fdisk editor functions if WITH_SLICES.

Approved by:	re
2002-11-27 19:58:57 +00:00
jhb
3dd686b7d1 Only include the fdisk editor and associated code if WITH_SLICES is
defined.

Tested on:	i386, alpha, sparc64
Approved by:	re
2002-11-27 19:57:39 +00:00
jhb
a204996e2e Only define the MBR or IPL menu on i386 (PC98 uses IPL, other i386 use
MBR).

Approved by:	re
2002-11-27 19:54:46 +00:00
jhb
7df1ada687 - Only define syscons menus and syscons menu items in other menus if
WITH_SYSCONS is defined.
- Only define mouse menus and mouse menu items if WITH_MICE is defined.
- Use WITH_SLICES instead of explicit lists of architectures to control
  the layout of menus dependent on if slices are used on this arch or not.
- Only include the linux startup option if WITH_LINUX is defined.
- Only include the SVR4 startup option on i386.  It doesn't work on sparc64,
  and it is debatable that it even works on i386.
- Change the OSF1 startup option to execute configOSF1() instead of just
  setting the variable so that /compat/osf1 gets created.

Tested on:	i386, alpha, sparc64
Approved by:	re
2002-11-27 19:51:43 +00:00
jhb
cae9fe85df If the user choose to Undo everything in the label editor, only run the
fdisk editor if WITH_SLICES.  Before this on arch's that didn't support
slices such as alpha and sparc64 you would drop into the fdisk editor after
doing an Undo in the label editor.

Approved by:	re
2002-11-27 19:46:18 +00:00
jhb
f5ed172881 - Use WITH_SLICES to conditionalize the fdisk editor during install instead
of an explicit list of architecture defines.
- Tweak the message prior to the label editor in the !WITH_SLICES case to
  make it slightly less awkward since this is the first dialog we see after
  starting an install.
- Only offer to customize syscons settings if WITH_SYSCONS.
- Offer to enable Linux compat if WITH_LINUX.  Before we only did this for
  i386.
- On the alpha, offer to enable OSF/1 compat after asking about Linux
  compat.
- Only offer to configure moused(8) if WITH_MICE is defined.

Tested on:	i386, alpha, sparc64
Approved by:	re
2002-11-27 19:45:10 +00:00
jhb
9c5f468a4e Only include the diskPartitionEditor script command if WITH_SLICES is
defined.

Approved by:	re
2002-11-27 19:41:06 +00:00
jhb
4ad38278f3 Only try to setup moused(8) before setting up the X server if WITH_MICE is
defined.

Approved by:	re
2002-11-27 19:39:26 +00:00
jhb
045f25753a - Add a configOSF1() function (#ifdef __alpha__) that creates /compat/osf1
in addition to setting osf1_enable to YES.
- Only define configLinux() #ifdef WITH_LINUX.

Approved by:	re
2002-11-27 19:37:00 +00:00
jhb
cf60e9b4b9 Add some helper macros to make #ifdef's in sysinstall easier to read
and more maintainable.
- WITH_SYSCONS: defined on all arch's that support syscons (currently i386,
  alpha, and ia64)
- WITH_MICE: defined on all arch's that support moused(8) (currently i386,
  alpha, and ia64)
- WITH_SLICES: defined on all arch's that use disk slices (currently i386
  and ia64)
- WITH_LINUX: defined on all arch's that support Linux binary compat
  (currently i386 and alpha)

Approved by:	re
2002-11-27 19:30:50 +00:00
jhb
f75a5d12c3 Only display the APM option in the Startup menu on i386.
Approved by:	re
2002-11-27 19:25:46 +00:00
jhb
35c231a12f Use #elif defined(__alpha__) instead of #elif __alpha__.
Approved by:	re
2002-11-27 19:22:25 +00:00
jhb
4d5b257abe - Assume __FreeBSD__ is greater than 3.
- Only include compat4x distribution if this is either i386 or alpha.
2002-11-27 19:13:53 +00:00
jhb
6880dc45b6 Expand X_AS_PKG so that we don't declare distribution bitmasks or menus
for the X distributions if X_AS_PKG is defined.

Tested on:	i386
Approved by:	re
2002-11-27 18:36:30 +00:00
jhb
2897e2728d Don't use fake 'c' or 'a' BSD partitions for CD-ROM devices. This fixes
sysinstall to create /cdrom entries in /etc/fstab that just use the
raw CD-ROM device /dev/cd0, etc.

Approved by:	re
2002-11-27 17:56:27 +00:00
keramida
a23151eda1 configXEnvironment doesn't work in sysinstall now.
Change the manpage to reflect that it's now called configXSetup.
Also document configXDesktop.

Submitted by:	pirat <pirat@access.inet.co.th>
2002-11-26 23:23:42 +00:00
bmah
5305c7ad55 Add GNOME 2 to the sysinstall desktop configuration menu, remove
the two GNOME 1-based alternatives.

While here, note that a majority of the items in this menu are not
sentences, and remove trailing dots to make the remainder consistent.

Reviewed by:	marcus
Approved by:	re (bmah)
2002-11-26 22:14:34 +00:00
marcel
5f52e523f0 Create a link /boot -> /<efi>/boot, where <efi> is the mountpoint
of the EFI file system. This makes the EFI partition non-optional.
I don't think that the links are actually correct, given that all
the mount points are under /mnt when sysinstall is run as init.
(ie a non-upgrade). Thus: I think I need to go in once more, but
at least this doesn't get lost...
2002-11-18 08:37:46 +00:00
nyan
0f47f00a64 Enable selecting the type of partition menu on pc98. 2002-11-16 16:36:01 +00:00
nyan
abff45d114 Fix to build for pc98. 2002-11-15 13:18:41 +00:00
marcel
dfa993f696 Add conditional code specific to ia64 to allow newfs(8)-ing FAT
partitions marked as being of type efi. This change adds code to
1. actually run the newfs command at mount time (install.c),
2. display the newfs state on screen (label.c)
3. allow toggling of the newfs state (label.c)

Even though newfs(8)-ing FAT partitions can be of use on i386
machines in general, it has been opted to minimize impact for
now.
2002-11-14 01:46:20 +00:00
marcel
f76e12575f Also test for type efi everywhere we currently test for type fat.
With this change there's no a priori difference between EFI and
FAT partitions. With this change and the corresponding change to
libdisk, we can create EFI partitions, just like regular FAT
partitions.
2002-11-13 05:39:59 +00:00
jhb
3ff77794e7 Use a clean flags variable when creating chunks from scripts instead of
leaking flags from earlier chunks into later ones.

PR:		bin/40655
Submitted by:	Thomas Zenker <thz@Lennartz-electronic.de>
2002-11-12 21:18:54 +00:00
jhb
b7191db17b Remove a line that set the status to success. We already do that at the
beginning, so the best this could achieve would be to mask an earlier
failure.  Break instead of continue for another failure case.
2002-11-12 21:12:42 +00:00
jhb
905d7568e9 Try to cleanup the non-interactive disk labeling code a bit. Rework
the loop that runs through the environment variables to be a bit more
intuitive.  Also, change some 'continue's in failure cases to 'break's
instead.  If we are going to fail, we should just do it.

PR:		bin/40654
Submitted by:	Thomas Zenker <thz@Lennartz-electronic.de> (partially)
2002-11-12 21:09:58 +00:00
jhb
42ccf7bdc3 Do a bit of cleanup. new_part() basically ignored the passed in size
argument as of revision 1.52 (July 12, 1996, about a month after I
graduated from high school) when 'newfs -u' support was axed, so remove it.
This also allows us to remove a hack in the create partition case where we
created the partition twice since we didn't have the size the first time.
2002-11-12 20:48:49 +00:00
jhb
c5b5f6837f Doh, fix a bug in previous commit. The default is to newfs for new
partitions, not to !newfs.
2002-11-12 20:40:15 +00:00
jhb
f170e9b712 When setting the mountpoint name, remember any previous setting of the
newfs flag for this partition.

PR:		bin/31837
Reported by:	Oliver Breuninger <ob@www.partner.de>
2002-11-12 20:26:52 +00:00