Some fixes related to the HAMMER support in the installer.
authorSascha Wildner <saw@online.de>
Thu, 1 Jan 2009 19:05:12 +0000 (20:05 +0100)
committerSascha Wildner <saw@online.de>
Thu, 1 Jan 2009 19:05:52 +0000 (20:05 +0100)
* Add HAMMER related command names to the correct cmdnames.conf and
  remove the one in contrib/ to avoid future confusion.

* Fix array initialization.

* Improve wording a bit.

contrib/bsdinstaller-1.1.6/src/backend/installer/conf/cmdnames.conf [deleted file]
contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c
contrib/bsdinstaller-1.1.6/src/backend/installer/fn_subpart_hammer.c
share/installer/cmdnames.conf

diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/conf/cmdnames.conf b/contrib/bsdinstaller-1.1.6/src/backend/installer/conf/cmdnames.conf
deleted file mode 100644 (file)
index 758b317..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-# Command names for DragonFly installer backend.
-# $Id: cmdnames.conf,v 1.15 2005/04/08 02:29:17 cpressey Exp $
-
-# This is in Bourne shell syntax so that it is easily editable;
-# it is also sourced by the installer, a C program.
-
-# Note that file names here should all be relative to the
-# installation media.  They should NOT include leading slashes.
-# They may contain extra command-line options.
-
-SH=bin/sh
-MKDIR=bin/mkdir
-CHMOD=bin/chmod
-LN=bin/ln
-RM=bin/rm
-CP=bin/cp
-DATE=bin/date
-ECHO=bin/echo
-DD=bin/dd
-MV=bin/mv
-CAT=bin/cat
-TEST=bin/test
-
-# XXX 'sysctl' and '[' in the following tests should ideally include
-# the full path to the executable.
-
-# Some operating systems (OpenBSD) have block devices for disks, slices, etc.
-# Others don't.
-
-if [ X`sysctl -n kern.ostype` = "XOpenBSD" ]; then
-       TEST_DEV="$TEST -b"
-else
-       TEST_DEV="$TEST -c"
-fi
-
-# Some operating systems (DragonFly) have a version of cpdup that supports -u.
-# Others don't, and we assume it is installed as a 'port' on those systems.
-
-if [ X`sysctl -n kern.ostype` = "XDragonFly" ]; then
-       CPDUP="bin/cpdup -o -vvv -u"
-       DHCPD=usr/sbin/dhcpd
-       RPCBIND=usr/sbin/portmap
-       MOUNTD=sbin/mountd
-       NFSD=sbin/nfsd
-else
-       CPDUP="usr/local/bin/cpdup -o -vvv"
-       DHCPD=usr/local/sbin/dhcpd
-       RPCBIND=usr/sbin/rpcbind
-       MOUNTD=usr/sbin/mountd
-       NFSD=usr/sbin/nfsd
-fi
-
-MOUNT=sbin/mount
-MOUNT_HAMMER=sbin/mount_hammer
-MOUNT_NULL=sbin/mount_null
-MOUNT_MFS=sbin/mount_mfs
-UMOUNT=sbin/umount
-SWAPON=sbin/swapon
-DISKLABEL=sbin/disklabel
-DISKLABEL64=sbin/disklabel64
-HAMMER=sbin/hammer
-NEWFS=sbin/newfs
-NEWFS_HAMMER=sbin/newfs_hammer
-NEWFS_MSDOS=sbin/newfs_msdos
-FDISK=sbin/fdisk
-DUMPON=sbin/dumpon
-IFCONFIG=sbin/ifconfig
-ROUTE=sbin/route
-DHCLIENT=sbin/dhclient
-SYSCTL=sbin/sysctl
-
-TOUCH=usr/bin/touch
-YES=usr/bin/yes
-BUNZIP2=usr/bin/bunzip2
-GREP=usr/bin/grep
-KILLALL=usr/bin/killall
-BASENAME=usr/bin/basename
-SORT=usr/bin/sort
-COMM=usr/bin/comm
-AWK=usr/bin/awk
-SED=usr/bin/sed
-BC=usr/bin/bc
-TR=usr/bin/tr
-
-PWD_MKDB=usr/sbin/pwd_mkdb
-CHROOT=usr/sbin/chroot
-VIDCONTROL=usr/sbin/vidcontrol
-KBDCONTROL=usr/sbin/kbdcontrol
-PW=usr/sbin/pw
-SWAPINFO=usr/sbin/swapinfo
-BOOT0CFG=usr/sbin/boot0cfg
-FDFORMAT=usr/sbin/fdformat
-PKG_ADD=usr/sbin/pkg_add
-PKG_DELETE=usr/sbin/pkg_delete
-PKG_CREATE=usr/sbin/pkg_create
-PKG_INFO=usr/sbin/pkg_info
-INETD=usr/sbin/inetd
-
-TFTPD=usr/libexec/tftpd
-
-CVSUP=usr/local/bin/cvsup
-MEMTEST=usr/local/bin/memtest
-
-# These aren't commands, but they're configurable here nonetheless.
-
-DMESG_BOOT=var/run/dmesg.boot
-INSTALLER_TEMP="/tmp/"
index 0691bb2..95a1ceb 100644 (file)
@@ -986,8 +986,8 @@ state_ask_fs(struct i_fn_args *a)
 
        switch (dfui_be_present_dialog(a->c, _("Select file system"),
            _("Use HAMMER|Use UFS|Return to Select Disk"),
-           _("Please select the file system you want to use with %s\n\n"
-             "HAMMER is the new %s file system.  UFS the traditional BSD file system"),
+           _("Please select the file system you want to use with %s.\n\n"
+             "HAMMER is the new %s file system.  UFS is the traditional BSD file system."),
            OPERATING_SYSTEM_NAME,
            OPERATING_SYSTEM_NAME))
        {
index 1cd411e..320478b 100644 (file)
@@ -76,7 +76,7 @@ static struct dfui_form *make_create_subpartitions_form(struct i_fn_args *);
 static int     show_create_subpartitions_form(struct dfui_form *, struct i_fn_args *);
 
 static const char *def_mountpt[7]  = {"/", "swap", "/var", "/tmp", "/usr", "/home", NULL};
-static long def_capacity[7]        = {-1,  128,  128,    128,    128,    256,      128,   0};
+static long def_capacity[7]        = {-1,     128,    128,    128,    256,     128,    0};
 
 static int expert = 0;
 
index b6bce06..f48bebf 100644 (file)
@@ -52,11 +52,16 @@ else
 fi
 
 MOUNT=sbin/mount
+MOUNT_HAMMER=sbin/mount_hammer
 MOUNT_MFS=sbin/mount_mfs
+MOUNT_NULL=sbin/mount_null
 UMOUNT=sbin/umount
 SWAPON=sbin/swapon
 DISKLABEL=sbin/disklabel
+DISKLABEL64=sbin/disklabel64
+HAMMER=sbin/hammer
 NEWFS=sbin/newfs
+NEWFS_HAMMER=sbin/newfs_hammer
 NEWFS_MSDOS=sbin/newfs_msdos
 FDISK=sbin/fdisk
 DUMPON=sbin/dumpon