6221730 ufs_log mdb module needs to be merged with the ufs one

Contributed by Richard Lowe <richlowe@richlowe.net>

--HG--
rename : usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile => deleted_files/usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile
rename : usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile => deleted_files/usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile
rename : usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile => deleted_files/usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile
rename : usr/src/cmd/mdb/common/modules/ufs_log/ufs_log.c => usr/src/cmd/mdb/common/modules/ufs/ufs_log.c

15 files changed, 89 insertions, 166 deletions

diff --git a/usr/src/cmd/mdb/Makefile.common b/usr/src/cmd/mdb/Makefile.common
index 01dbdd391a..e91e250f6b 100644
--- a/usr/src/cmd/mdb/Makefile.common
+++ b/usr/src/cmd/mdb/Makefile.common
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -72,7 +71,6 @@ COMMON_MODULES_KVM = \
 	specfs \
 	sppp \
 	ufs \
-	ufs_log \
 	usba \
 	zfs
 
diff --git a/usr/src/cmd/mdb/common/modules/ufs/ufs.c b/usr/src/cmd/mdb/common/modules/ufs/ufs.c
index 6d81d2acf0..d288718b7e 100644
--- a/usr/src/cmd/mdb/common/modules/ufs/ufs.c
+++ b/usr/src/cmd/mdb/common/modules/ufs/ufs.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -34,6 +33,8 @@
 #include <sys/fs/ufs_acl.h>
 #include <sys/fs/ufs_fs.h>
 
+#include "ufs_cmds.h"
+
 typedef struct inode_walk_data {
 	int iw_inohsz;
 	int iw_inohcnt;
@@ -645,6 +646,8 @@ static const mdb_dcmd_t dcmds[] = {
 	{ "inode", ":[-v]", "display summarized inode_t", inode },
 	{ "acl", ":", "given an inode, display its in core acl's", acl_dcmd },
 	{ "cg", "?[-v]", "display a summarized cylinder group structure", cg },
+	{ "mapentry", ":", "dumps ufslog mapentry", mapentry_dcmd },
+	{ "mapstats", ":", "dumps ufslog stats", mapstats_dcmd },
 	{ NULL }
 };
 
@@ -655,6 +658,8 @@ static const mdb_walker_t walkers[] = {
 		acl_walk_init, acl_walk_step, acl_walk_fini },
 	{ "cg", "walk cg's in bio buffer cache",
 		cg_walk_init, cg_walk_step, NULL },
+	{ "ufslogmap", "walk map entries in a ufs_log mt_map",
+		ufslogmap_walk_init, ufslogmap_walk_step, NULL },
 	{ NULL }
 };
 
diff --git a/usr/src/cmd/mdb/common/modules/ufs/ufs_cmds.h b/usr/src/cmd/mdb/common/modules/ufs/ufs_cmds.h
new file mode 100644
index 0000000000..a77d95bbbf
--- /dev/null
+++ b/usr/src/cmd/mdb/common/modules/ufs/ufs_cmds.h
@@ -0,0 +1,48 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	_UFS_CMDS_H
+#define	_UFS_CMDS_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int mapentry_dcmd(uintptr_t, uint_t, int, const mdb_arg_t *);
+extern int mapstats_dcmd(uintptr_t, uint_t, int, const mdb_arg_t *);
+
+extern int ufslogmap_walk_init(mdb_walk_state_t *);
+extern int ufslogmap_walk_step(mdb_walk_state_t *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UFS_CMDS_H */
diff --git a/usr/src/cmd/mdb/common/modules/ufs_log/ufs_log.c b/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c
index aca9d48aa5..742db1d0c0 100644
--- a/usr/src/cmd/mdb/common/modules/ufs_log/ufs_log.c
+++ b/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,6 +31,8 @@
 #include <sys/uio.h>
 #include <sys/vnode.h>
 #include <sys/fs/ufs_log.h>
+#include "ufs_cmds.h"
+
 
 typedef struct ufslogmap_walk_data {
 	mapentry_t me;
@@ -239,22 +240,3 @@ mapstats_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	}
 	return (DCMD_OK);
 }
-
-static const mdb_walker_t walkers[] = {
-	{ "ufslogmap", "walk map entries in a ufs_log mt_map",
-		ufslogmap_walk_init, ufslogmap_walk_step, NULL },
-	{ NULL }
-};
-static const mdb_dcmd_t dcmds[] = {
-	{ "mapentry", ":", "dumps ufslog mapentry", mapentry_dcmd },
-	{ "mapstats", ":", "dumps ufslog stats", mapstats_dcmd },
-	{ NULL }
-};
-
-static const mdb_modinfo_t modinfo = { MDB_API_VERSION, dcmds, walkers };
-
-const mdb_modinfo_t *
-_mdb_init(void)
-{
-	return (&modinfo);
-}
diff --git a/usr/src/cmd/mdb/intel/amd64/ufs/Makefile b/usr/src/cmd/mdb/intel/amd64/ufs/Makefile
index 9cd9ff6664..ca03049662 100644
--- a/usr/src/cmd/mdb/intel/amd64/ufs/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/ufs/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,7 +27,7 @@
 MODULE = ufs.so
 MDBTGT = kvm
 
-MODSRCS = ufs.c
+MODSRCS = ufs.c ufs_log.c
 
 include ../../../../Makefile.cmd
 include ../../../../Makefile.cmd.64
diff --git a/usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile b/usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile
deleted file mode 100644
index 5243c1e5c0..0000000000
--- a/usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-MODULE = ufs_log.so
-MDBTGT = kvm
-
-MODSRCS = ufs_log.c
-
-include ../../../../Makefile.cmd
-include ../../../../Makefile.cmd.64
-include ../../Makefile.amd64
-include ../../../Makefile.module
diff --git a/usr/src/cmd/mdb/intel/ia32/ufs/Makefile b/usr/src/cmd/mdb/intel/ia32/ufs/Makefile
index 1ee7422467..212a14d9d4 100644
--- a/usr/src/cmd/mdb/intel/ia32/ufs/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/ufs/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,7 +27,7 @@
 MODULE = ufs.so
 MDBTGT = kvm
 
-MODSRCS = ufs.c
+MODSRCS = ufs.c ufs_log.c
 
 include ../../../../Makefile.cmd
 include ../../Makefile.ia32
diff --git a/usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile b/usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile
deleted file mode 100644
index 97cc05f41e..0000000000
--- a/usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-MODULE = ufs_log.so
-MDBTGT = kvm
-
-MODSRCS = ufs_log.c
-
-include ../../../../Makefile.cmd
-include ../../Makefile.ia32
-include ../../../Makefile.module
diff --git a/usr/src/cmd/mdb/sparc/v9/ufs/Makefile b/usr/src/cmd/mdb/sparc/v9/ufs/Makefile
index f967c85346..c48e4fc262 100644
--- a/usr/src/cmd/mdb/sparc/v9/ufs/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/ufs/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,7 +27,7 @@
 MODULE = ufs.so
 MDBTGT = kvm
 
-MODSRCS = ufs.c
+MODSRCS = ufs.c ufs_log.c
 
 include ../../../../Makefile.cmd
 include ../../../../Makefile.cmd.64
diff --git a/usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile b/usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile
deleted file mode 100644
index b070553d3b..0000000000
--- a/usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-MODULE = ufs_log.so
-MDBTGT = kvm
-
-MODSRCS = ufs_log.c
-
-include ../../../../Makefile.cmd
-include ../../../../Makefile.cmd.64
-include ../../Makefile.sparcv9
-include ../../../Makefile.module
diff --git a/usr/src/pkgdefs/SUNWmdb/prototype_i386 b/usr/src/pkgdefs/SUNWmdb/prototype_i386
index e1e2cb7c8d..7a1fb04fd3 100644
--- a/usr/src/pkgdefs/SUNWmdb/prototype_i386
+++ b/usr/src/pkgdefs/SUNWmdb/prototype_i386
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -70,7 +69,6 @@ f none usr/lib/mdb/kvm/amd64/sctp.so 555 root sys
 f none usr/lib/mdb/kvm/amd64/specfs.so 555 root sys
 f none usr/lib/mdb/kvm/amd64/sppp.so 555 root sys
 f none usr/lib/mdb/kvm/amd64/ufs.so 555 root sys
-f none usr/lib/mdb/kvm/amd64/ufs_log.so 555 root sys
 f none usr/lib/mdb/kvm/amd64/uhci.so 555 root sys
 f none usr/lib/mdb/kvm/amd64/usba.so 555 root sys
 f none usr/lib/mdb/kvm/audiosup.so 555 root sys
@@ -95,7 +93,6 @@ f none usr/lib/mdb/kvm/sctp.so 555 root sys
 f none usr/lib/mdb/kvm/specfs.so 555 root sys
 f none usr/lib/mdb/kvm/sppp.so 555 root sys
 f none usr/lib/mdb/kvm/ufs.so 555 root sys
-f none usr/lib/mdb/kvm/ufs_log.so 555 root sys
 f none usr/lib/mdb/kvm/uhci.so 555 root sys
 f none usr/lib/mdb/kvm/usba.so 555 root sys
 d none usr/lib/mdb/proc/amd64 755 root bin
diff --git a/usr/src/pkgdefs/SUNWmdb/prototype_sparc b/usr/src/pkgdefs/SUNWmdb/prototype_sparc
index 623ac1196e..0a24c3f4b3 100644
--- a/usr/src/pkgdefs/SUNWmdb/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWmdb/prototype_sparc
@@ -67,7 +67,6 @@ f none usr/lib/mdb/kvm/sparcv9/sppp.so 555 root sys
 f none usr/lib/mdb/kvm/sparcv9/sd.so 555 root sys
 f none usr/lib/mdb/kvm/sparcv9/ssd.so 555 root sys
 f none usr/lib/mdb/kvm/sparcv9/ufs.so 555 root sys
-f none usr/lib/mdb/kvm/sparcv9/ufs_log.so 555 root sys
 f none usr/lib/mdb/kvm/sparcv9/usba.so 555 root sys
 d none usr/lib/mdb/proc/sparcv9 755 root sys
 f none usr/lib/mdb/proc/sparcv9/libavl.so 555 root sys
diff --git a/usr/src/pkgdefs/SUNWmdbr/prototype_i386 b/usr/src/pkgdefs/SUNWmdbr/prototype_i386
index 07fe248387..bd9ea07f75 100644
--- a/usr/src/pkgdefs/SUNWmdbr/prototype_i386
+++ b/usr/src/pkgdefs/SUNWmdbr/prototype_i386
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -51,7 +50,6 @@ f none kernel/kmdb/amd64/sctp 555 root sys
 f none kernel/kmdb/amd64/specfs 555 root sys
 f none kernel/kmdb/amd64/sppp 555 root sys
 f none kernel/kmdb/amd64/ufs 555 root sys
-f none kernel/kmdb/amd64/ufs_log 555 root sys
 f none kernel/kmdb/amd64/uhci 555 root sys
 f none kernel/kmdb/amd64/usba 555 root sys
 f none kernel/kmdb/audiosup 555 root sys
@@ -76,7 +74,6 @@ f none kernel/kmdb/sctp 555 root sys
 f none kernel/kmdb/specfs 555 root sys
 f none kernel/kmdb/sppp 555 root sys
 f none kernel/kmdb/ufs 555 root sys
-f none kernel/kmdb/ufs_log 555 root sys
 f none kernel/kmdb/uhci 555 root sys
 f none kernel/kmdb/usba 555 root sys
 
diff --git a/usr/src/pkgdefs/SUNWmdbr/prototype_sparc b/usr/src/pkgdefs/SUNWmdbr/prototype_sparc
index e8d71ee64f..d08979e697 100644
--- a/usr/src/pkgdefs/SUNWmdbr/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWmdbr/prototype_sparc
@@ -57,7 +57,6 @@ f none kernel/kmdb/sparcv9/specfs 555 root sys
 f none kernel/kmdb/sparcv9/sppp 555 root sys
 f none kernel/kmdb/sparcv9/ssd 555 root sys
 f none kernel/kmdb/sparcv9/ufs 555 root sys
-f none kernel/kmdb/sparcv9/ufs_log 555 root sys
 f none kernel/kmdb/sparcv9/usba 555 root sys
 #
 d none platform 755 root sys
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh
index 257cfecc2d..2e88cadc5c 100644
--- a/usr/src/tools/scripts/bfu.sh
+++ b/usr/src/tools/scripts/bfu.sh
@@ -5749,6 +5749,14 @@ mondo_loop() {
 	rm -f $rootprefix/kernel/misc/ufs_log
 	rm -f $rootprefix/kernel/misc/sparcv9/ufs_log
 
+	#Remove ufs_log mdb/kmdb modules - now merged in to ufs module
+	rm -f $rootprefix/kernel/kmdb/ufs_log
+	rm -f $rootprefix/kernel/kmdb/sparcv9/ufs_log
+	rm -f $rootprefix/kernel/kmdb/amd64/ufs_log
+	rm -f $rootprefix/usr/lib/mdb/kvm/ufs_log.so
+	rm -f $rootprefix/usr/lib/mdb/kvm/sparcv9/ufs_log.so
+	rm -f $rootprefix/usr/lib/mdb/kvm/amd64/ufs_log.so
+
 	#Remove diskmgtd. If backward BFU, will get re-installed from
 	#archive.
 	rm -f $usr/lib/diskmgtd