Say welcome to 'sade', the SysAdmins Disk Editor. It's the fdisk and disklabel part

of sysinstall. So sysinstall may retire now, we have the important non-install part
of it covered.

ATM it doesn't understand GEOM stuff (like mirror, stripe, raid, ...), but patches
to change this and to clean it up internally are more than welcome.

Submitted by:	mami@nyitolap.hu

1 files changed, 11 insertions, 62 deletions

diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index d9aeb5c..b67e5a1 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -4,15 +4,16 @@
 _wizard=	wizard.c
 .endif
 
-PROG=	sysinstall
-MAN=	sysinstall.8
-SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
-	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
-	ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
-	label.c main.c makedevs.c media.c menus.c misc.c modules.c \
-	mouse.c msg.c network.c nfs.c options.c package.c \
-	system.c tape.c tcpip.c termcap.c ttys.c ufs.c user.c \
-	variable.c ${_wizard} keymap.h countries.h
+PROG=	sade
+MAN=	sade.8
+SRCS=	command.c config.c devices.c \
+	disks.c dispatch.c dmenu.c \
+	globals.c install.c keymap.c \
+	label.c main.c makedevs.c menus.c misc.c \
+	msg.c system.c termcap.c \
+	variable.c ${_wizard} keymap.h
+
+# command.c
 
 CFLAGS+= -DUSE_GZIP=1
 .if ${MACHINE} == "pc98"
@@ -23,39 +24,8 @@ CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I.
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lutil -ldisk -lftpio
 
-#
-# When distributions have both UP and SMP kernels sysinstall
-# will probe for the number of cpus on the target machine and
-# automatically select which is appropriate.  This can be overridden
-# through the menus or both kernels can be installed (with the
-# most "appropriate" one setup as /boot/kernel).  For now this
-# is done for i386 and amd64; for other systems support must be
-# added to identify the cpu count if acpi and MPTable probing
-# is insufficient.
-#
-# The unmber of cpus probed is passed through the environment in
-# VAR_NCPUS ("ncpus") to scripts.
-#
-# Note that WITH_SMP is a compile time option that enables the
-# builtin menus for the SMP kernel configuration.  If this kernel
-# is not built (see release/Makefile) then this should not be
-# enabled as sysinstall may try to select an SMP kernel config
-# where none is available.  This option should not be needed--we
-# should probe for an SMP kernel in the distribution but doing
-# that is painful because of media changes and the structure of
-# sysinstall so for now it's a priori.
-#
-.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "amd64"
-SRCS+=	acpi.c biosmptable.c
-.if exists(${.CURDIR}/../../sys/${MACHINE}/conf/SMP)
-CFLAGS+=-DWITH_SMP	
-.endif
-DPADD+=	${LIBDEVINFO}
-LDADD+=	-ldevinfo
-.endif
-
 CLEANFILES=	makedevs.c rtermcap
-CLEANFILES+=	keymap.tmp keymap.h countries.tmp countries.h
+CLEANFILES+=	keymap.tmp keymap.h
 
 .if exists(${.CURDIR}/../../share/termcap/termcap.src)
 RTERMCAP=	TERMCAP=${.CURDIR}/../../share/termcap/termcap.src ./rtermcap
@@ -130,25 +100,4 @@ keymap.h:
 	( echo "	{ NULL, NULL }"; echo "};" ; echo "" ) >> keymap.tmp
 	mv keymap.tmp keymap.h
 
-countries.h: ${.CURDIR}/../../share/misc/iso3166
-	rm -f countries.tmp
-	awk 'BEGIN { \
-	    FS = "\t"; \
-	    num = 1; \
-	    print "DMenu MenuCountry = {"; \
-	    print "    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,"; \
-	    print "    \"Country Selection\","; \
-	    print "    \"Please choose a country, region, or group.\\n\""; \
-	    print "    \"Select an item using [SPACE] or [ENTER].\","; \
-	    printf "    NULL,\n    NULL,\n    { "; \
-	} \
-	/^[[:space:]]*#/ {next;} \
-	{if (num > 1) {printf "      ";} \
-	    print "{ \"" num "\", \"" $$4 "\"" \
-	    ", dmenuVarCheck, dmenuSetCountryVariable" \
-	    ", NULL, VAR_COUNTRY \"=" tolower($$1) "\" },"; \
-	    ++num;} \
-	END {print "      { NULL } }\n};\n";}' < ${.ALLSRC} > countries.tmp
-	mv countries.tmp ${.TARGET}
-
 .include <bsd.prog.mk>