From 402b924225011ab38d7e088fead75cce9612e16d Mon Sep 17 00:00:00 2001 From: nia Date: Mon, 6 Jun 2022 13:28:55 +0000 Subject: [PATCH] revert bits and pieces I accidentally included in my last commit from hannken --- distrib/sets/lists/base/mi | 24 +++++++++--------- sbin/Makefile | 51 ++++++++------------------------------ 2 files changed, 23 insertions(+), 52 deletions(-) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 5e469367d0f9..fe9aea0b4b4a 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1307 2022/06/06 10:56:27 nia Exp $ +# $NetBSD: mi,v 1.1308 2022/06/06 13:28:55 nia Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -384,7 +384,7 @@ ./sbin/fsck_lfs base-sysutil-root ./sbin/fsck_msdos base-sysutil-root ./sbin/fsck_udf base-sysutil-root -./sbin/fsck_v7fs base-sysutil-root v7fs +./sbin/fsck_v7fs base-sysutil-root ./sbin/fsdb base-sysutil-root ./sbin/fsirand base-sysutil-root ./sbin/gpt base-sysutil-root @@ -405,23 +405,23 @@ ./sbin/modstat base-sysutil-root ./sbin/modunload base-sysutil-root ./sbin/mount base-sysutil-root -./sbin/mount_ados base-adosfs-root ados +./sbin/mount_ados base-adosfs-root ./sbin/mount_autofs base-sysutil-root ./sbin/mount_cd9660 base-sysutil-root -./sbin/mount_chfs base-sysutil-root chfs -./sbin/mount_efs base-efs-root efs +./sbin/mount_chfs base-sysutil-root +./sbin/mount_efs base-efs-root ./sbin/mount_ext2fs base-ext2fs-root ./sbin/mount_fdesc base-miscfs-root ./sbin/mount_ffs base-sysutil-root -./sbin/mount_filecore base-filecorefs-root filecore -./sbin/mount_hfs base-hfs-root hfs +./sbin/mount_filecore base-filecorefs-root +./sbin/mount_hfs base-hfs-root ./sbin/mount_hfsp base-obsolete obsolete ./sbin/mount_kernfs base-sysutil-root ./sbin/mount_lfs base-sysutil-root ./sbin/mount_mfs base-sysutil-root ./sbin/mount_msdos base-sysutil-root ./sbin/mount_nfs base-nfsclient-root -./sbin/mount_nilfs base-sysutil-root nilfs +./sbin/mount_nilfs base-sysutil-root ./sbin/mount_ntfs base-ntfs-root ./sbin/mount_null base-miscfs-root ./sbin/mount_overlay base-miscfs-root @@ -431,13 +431,13 @@ ./sbin/mount_puffs base-sysutil-root ./sbin/mount_qemufwcfg base-sysutil-root ./sbin/mount_smbfs base-obsolete obsolete -./sbin/mount_sysvbfs base-sysutil-root sysvbfs +./sbin/mount_sysvbfs base-sysutil-root ./sbin/mount_tmpfs base-miscfs-root ./sbin/mount_udf base-sysutil-root ./sbin/mount_ufs base-sysutil-root ./sbin/mount_umap base-miscfs-root ./sbin/mount_union base-miscfs-root -./sbin/mount_v7fs base-sysutil-root v7fs +./sbin/mount_v7fs base-sysutil-root ./sbin/mount_zfs base-zfs-root zfs ./sbin/mountd base-obsolete obsolete ./sbin/newbtconf base-sysutil-root @@ -445,9 +445,9 @@ ./sbin/newfs_ext2fs base-sysutil-root ./sbin/newfs_lfs base-sysutil-root ./sbin/newfs_msdos base-sysutil-root -./sbin/newfs_sysvbfs base-sysutil-root sysvbfs +./sbin/newfs_sysvbfs base-sysutil-root ./sbin/newfs_udf base-sysutil-root -./sbin/newfs_v7fs base-sysutil-root v7fs +./sbin/newfs_v7fs base-sysutil-root ./sbin/newlfs base-obsolete obsolete ./sbin/nfsd base-obsolete obsolete ./sbin/nfsiod base-obsolete obsolete diff --git a/sbin/Makefile b/sbin/Makefile index b97143b28b50..8cc5125b95c9 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.138 2022/06/06 10:56:28 nia Exp $ +# $NetBSD: Makefile,v 1.139 2022/06/06 13:28:55 nia Exp $ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # Not ported: XNSrouted enpload scsiformat startslip @@ -21,17 +21,25 @@ SUBDIR+= newfs_ext2fs fsck_ext2fs SUBDIR+= newfs fsck_ffs fsdb dump restore clri tunefs resize_ffs SUBDIR+= newfs_lfs fsck_lfs dump_lfs resize_lfs SUBDIR+= newfs_msdos fsck_msdos +SUBDIR+= newfs_sysvbfs SUBDIR+= newfs_udf fsck_udf +SUBDIR+= newfs_v7fs fsck_v7fs +SUBDIR+= mount_ados SUBDIR+= mount_autofs SUBDIR+= mount_cd9660 +SUBDIR+= mount_chfs +SUBDIR+= mount_efs SUBDIR+= mount_ext2fs SUBDIR+= mount_fdesc +SUBDIR+= mount_filecore SUBDIR+= mount_ffs +SUBDIR+= mount_hfs SUBDIR+= mount_kernfs SUBDIR+= mount_lfs SUBDIR+= mount_msdos SUBDIR+= mount_udf SUBDIR+= mount_nfs +SUBDIR+= mount_nilfs SUBDIR+= mount_ntfs SUBDIR+= mount_null SUBDIR+= mount_overlay @@ -40,9 +48,11 @@ SUBDIR+= mount_procfs SUBDIR+= mount_ptyfs SUBDIR+= mount_puffs SUBDIR+= mount_qemufwcfg +SUBDIR+= mount_sysvbfs SUBDIR+= mount_tmpfs SUBDIR+= mount_umap SUBDIR+= mount_union +SUBDIR+= mount_v7fs .if (${USE_INET6} != "no") SUBDIR+= ping6 @@ -52,45 +62,6 @@ SUBDIR+= ping6 SUBDIR+= iscsictl iscsid .endif -.if (${MKADOS} != "no") -SUBDIR+= mount_ados -.endif - -.if (${MKCHFS} != "no") -SUBDIR+= mount_chfs -.endif - -.if (${MKEFS} != "no") -SUBDIR+= mount_efs -.endif - -.if (${MKFILECORE} != "no") -SUBDIR+= mount_filecore -.endif - -.if (${MKHFS} != "no") -SUBDIR+= mount_hfs -.endif - -.if (${MKLFS} != "no") -SUBDIR+= newfs_lfs fsck_lfs dump_lfs resize_lfs -SUBDIR+= mount_lfs -.endif - -.if (${MKNILFS} != "no") -SUBDIR+= mount_nilfs -.endif - -.if (${MKSYSVBFS} != "no") -SUBDIR+= newfs_sysvbfs -SUBDIR+= mount_sysvbfs -.endif - -.if (${MKV7FS} != "no") -SUBDIR+= newfs_v7fs fsck_v7fs -SUBDIR+= mount_v7fs -.endif - # IPsec SUBDIR+= setkey