--- /opt/SUNWut/lib/dhcp/isc/dhcp_config_linux.orig	2006-10-30 00:35:04.000000000 +0100
+++ /opt/SUNWut/lib/dhcp/isc/dhcp_config_linux	2006-10-30 00:22:35.000000000 +0100
@@ -7,7 +7,7 @@
 #
 
 UTDHCPDIR="$ETCDIR"/net/dhcp
-DHCPDCONF=/etc/dhcpd.conf
+DHCPDCONF=/etc/dhcp3/dhcpd.conf
 UTDHCPFILE="$UTDHCPDIR"/utdhcp
 OPTIONSFILENAME="SunRay-options"
 OPTIONSFILE="$UTDHCPDIR"/"$OPTIONSFILENAME"
--- /opt/SUNWut/lib/dhcp/isc/utdhcpservice.orig	2006-10-30 00:35:16.000000000 +0100
+++ /opt/SUNWut/lib/dhcp/isc/utdhcpservice	2006-10-30 00:23:01.000000000 +0100
@@ -49,10 +49,10 @@
 
 # names of files and directories that will be touched by this script
 #
-DHCP_CONFIG="/etc/dhcpd.conf";
+DHCP_CONFIG="/etc/dhcp3/dhcpd.conf";
 DHCP_CONFIG_SAMPLE_RHAS="/usr/share/doc/dhcp-3.0.1/dhcpd.conf.sample";
-DHCP_CONFIG_SAMPLE_SLES="/usr/share/doc/packages/dhcp-server/dhcpd.conf";
-DHCP_DIR="/var/lib/dhcp";
+DHCP_CONFIG_SAMPLE_SLES="/usr/share/doc/dhcp3-server/examples/dhcpd.conf";
+DHCP_DIR="/var/lib/dhcp3";
 TMPDIR="/var/opt/SUNWut/tmp"
 CORONA_NAME="SunRay";
 CORONA_TITLE="Sun Ray";
@@ -70,8 +70,8 @@
 typeset DHCP_ENABLED=true
 typeset DHCP_CONFIGURED=true
 typeset DHCP_RUNNING=true
-typeset DHCP_PACKAGE_RH="dhcp"
-typeset DHCP_PACKAGE_SU="dhcp-server"
+typeset DHCP_PACKAGE_RH="dhcp3-server"
+typeset DHCP_PACKAGE_SU="dhcp3-server"
 typeset DHCP_PACKAGE="not installed"
 typeset DHCP_STATE="online"
 
@@ -91,10 +91,10 @@
 
 function StatusDHCP {
     typeset PACKAGE="${DHCP_PACKAGE}"
-    if $DHCP_INSTALLED ; then
-      # get the actual package name including version and release
-      PACKAGE="$(rpm -q ${DHCP_PACKAGE} 2> /dev/null)"
-    fi
+    #if $DHCP_INSTALLED ; then
+    #  # get the actual package name including version and release
+    #  PACKAGE="$(rpm -q ${DHCP_PACKAGE} 2> /dev/null)"
+    #fi
     if ! $DHCP_RUNNING && [ $DHCP_STATE != "unconfigured" ] ; then
       DHCP_STATE="disabled"
     fi
@@ -123,7 +123,7 @@
        if [[ $? == 0 ]]; then
             mv ${DHCP_CONFIG} ${DHCP_CONFIG}.sunray
        else
-	   dhcpd -t > /dev/null 2>&1
+	   dhcpd3 -t > /dev/null 2>&1
 	   if [[ $? == 0 ]]; then
 		cat > ${DHCP_CONFIG}.$$ <<-!
 # ${SUNRAY_FILE_MARK} /etc/dhcpd.conf
@@ -131,9 +131,9 @@
 		cat ${DHCP_CONFIG} >> ${DHCP_CONFIG}.$$
 		rm ${DHCP_CONFIG}
 		mv ${DHCP_CONFIG}.$$ ${DHCP_CONFIG}	
-		chkconfig --add dhcpd >/dev/null 2>&1
+		#chkconfig --add dhcpd >/dev/null 2>&1
 		# Hack for Red Hat to create Start link in /etc/rc.d/rc5.d
-		chkconfig --level 5 dhcpd on >/dev/null 2>&1
+		#chkconfig --level 5 dhcpd on >/dev/null 2>&1
 		return 0
              else
                 mv ${DHCP_CONFIG} ${DHCP_CONFIG}.sunray
@@ -150,9 +150,9 @@
       touch ${DHCP_DIR}/db/dhcpd.leases
     else touch ${DHCP_DIR}/dhcpd.leases
     fi
-    chkconfig --add dhcpd >/dev/null 2>&1
+    #chkconfig --add dhcpd >/dev/null 2>&1
     # Hack for Red Hat to create Start link in /etc/rc.d/rc5.d
-    chkconfig --level 5 dhcpd on >/dev/null 2>&1
+    #chkconfig --level 5 dhcpd on >/dev/null 2>&1
 
     return 0
 }
@@ -184,7 +184,7 @@
 	if [[ -f ${DHCP_CONFIG}.sunray ]]; then
 	    mv ${DHCP_CONFIG}.sunray ${DHCP_CONFIG}
 	fi
-	chkconfig --del dhcpd >/dev/null 2>&1
+	#chkconfig --del dhcpd >/dev/null 2>&1
 	rm -f ${DHCP_CONFIG}.$$
         if [[ -f ${DHCP_DIR}/db/dhcpd.leases ]]; then
 	   rm -f ${DHCP_DIR}/db/dhcpd.leases
@@ -204,7 +204,7 @@
       return 3
     fi
 
-    /etc/init.d/dhcpd start > /dev/null 2>&1
+    /etc/init.d/dhcp3-server start > /dev/null 2>&1
     return $?
 }
 
@@ -213,7 +213,7 @@
       return 3
     fi
 
-    /etc/init.d/dhcpd stop > /dev/null 2>&1
+    /etc/init.d/dhcp3-server stop > /dev/null 2>&1
     return $?
 }
 
@@ -222,7 +222,7 @@
       return 3
     fi
 
-    /etc/init.d/dhcpd restart > /dev/null 2>&1
+    /etc/init.d/dhcp3-server restart > /dev/null 2>&1
     return $?
 }
 
@@ -263,7 +263,7 @@
       	    DHCP_CONFIGURED=false	# Interface / subnet not defined
     	fi
 
-    	/etc/init.d/dhcpd status 2> /dev/null | grep "running" >/dev/null 2>&1
+    	/etc/init.d/dhcp3-server status 2> /dev/null | grep "running" >/dev/null 2>&1
     	if [[ $? -ne 0 ]]; then
       	    DHCP_RUNNING=false
     	fi
--- /opt/SUNWut/lib/utctl.d/features/utcompatlinksctl.orig	2007-02-02 20:47:52.000000000 +0100
+++ /opt/SUNWut/lib/utctl.d/features/utcompatlinksctl	2007-02-02 20:48:34.000000000 +0100
@@ -103,11 +103,11 @@
 	COMPATLINK_LIBGDBM=$LIB_COMPATLINKS/${LIBGDBM##*/}
 
 	LIBLDAP=/usr/lib/libldap.so.199
-	COMPATLIB_LIBLDAP=/usr/lib/libldap-2.2.so.7
+	COMPATLIB_LIBLDAP=/usr/lib/libldap-2.3.so.0
 	COMPATLINK_LIBLDAP=$LIB_COMPATLINKS/${LIBLDAP##*/}
 
 	LIBLBER=/usr/lib/liblber.so.199
-	COMPATLIB_LIBLBER=/usr/lib/liblber-2.2.so.7
+	COMPATLIB_LIBLBER=/usr/lib/liblber-2.3.so.0
 	COMPATLINK_LIBLBER=$LIB_COMPATLINKS/${LIBLBER##*/}
 }
 
--- /opt/SUNWut/lib/utadmingid.orig	2006-10-30 00:34:15.000000000 +0100
+++ /opt/SUNWut/lib/utadmingid	2006-10-21 23:20:17.000000000 +0200
@@ -15,7 +15,7 @@
 ETCDIR="/etc/opt/SUNWut"
 UTADMINPW=${ETCDIR}/utadmin.pw
 if [ -f $UTADMINPW ] ; then
-	WEBGUI_GROUP=`/bin/ls -gn $UTADMINPW | /bin/awk '{print $3}' `
+	WEBGUI_GROUP=`/bin/ls -gn $UTADMINPW | /usr/bin/awk '{print $3}' `
 fi
 WEBGUI_GROUP=${WEBGUI_GROUP:-root}
 print $WEBGUI_GROUP
--- /opt/SUNWut/lib/utprodinfo.orig	2006-10-30 00:36:21.000000000 +0100
+++ /opt/SUNWut/lib/utprodinfo	2006-10-28 14:41:54.000000000 +0200
@@ -79,13 +79,13 @@
 # --- BASEDIR - basedirectory where the product is installed. Ex: /opt
 Param[${MAXParam}]="BASEDIR"
 SunOS_Mapped_Param[${MAXParam}]="BASEDIR"
-Linux_Mapped_Param[${MAXParam}]="%{INSTALLPREFIX}"
+Linux_Mapped_Param[${MAXParam}]="INSTALLPREFIX"
 let MAXParam+=1
 # --- VERSION - version number with the build info.  Ex: 2.0_37.b
 Param[${MAXParam}]="VERSION"
 SunOS_Mapped_Param[${MAXParam}]="VERSION"
 SunOS_Mapped_Sed[${MAXParam}]="s/\([0-9]\{1,\}\.[0-9]\{1,\}_[0-9]\{1,2\}\.\{0,1\}[a-z]\{0,1\}\),.*/\1/"
-Linux_Mapped_Param[${MAXParam}]="%{VERSION}_%{RELEASE}"
+Linux_Mapped_Param[${MAXParam}]='DEBVERSION'
 let MAXParam+=1
 # --- PSTAMP - product timestamp
 Param[${MAXParam}]="PSTAMP"
@@ -95,17 +95,17 @@
 # --- NAME - description of the package.
 Param[${MAXParam}]="NAME"
 SunOS_Mapped_Param[${MAXParam}]="NAME"
-Linux_Mapped_Param[${MAXParam}]="%{SUMMARY}"
+Linux_Mapped_Param[${MAXParam}]='${Description}'
 let MAXParam+=1
 # --- PRODVERS - product version without the build info.  Ex: 2.0
 Param[${MAXParam}]="PRODVERS"
 SunOS_Mapped_Param[${MAXParam}]="SUNW_PRODVERS"
-Linux_Mapped_Param[${MAXParam}]="%{VERSION}"
+Linux_Mapped_Param[${MAXParam}]='DEBPRODVERS'
 let MAXParam+=1
 # --- PKGNAME - package name. Ex: SUNWuto
 Param[${MAXParam}]="PKGNAME"
 SunOS_Mapped_Param[${MAXParam}]="PKGINST"
-Linux_Mapped_Param[${MAXParam}]="%{NAME}"
+Linux_Mapped_Param[${MAXParam}]='${Package}'
 let MAXParam+=1
 # --- INSTDATE - date the package is installed on the system.
 Param[${MAXParam}]="INSTDATE"
@@ -339,7 +339,24 @@
 		# found no params, just return
 		return 0
 	fi
-	rpm -q --queryformat ${MAPPEDLIST} $PKGNAME 2>/dev/null
+
+	DEB="`echo "${PKGNAME}" | tr '[A-Z]' '[a-z]'`"
+	VERSION=""
+	PRODVERS=""
+	if [ "`echo "${MAPPEDLIST}"|grep "DEBVERSION"`" ]; then
+		VERSION="`dpkg-query -f '${Version}\n' -W "${DEB}" | sed -e 's/-/_/'`"
+	fi
+	if [ "`echo "${MAPPEDLIST}"|grep "DEBPRODVERS"`" ]; then
+		PRODVERS="`dpkg-query -f '${Version}\n' -W "${DEB}" | sed -e 's/-.*$//'`"
+	fi
+
+	QL="`echo "${MAPPEDLIST}"|sed -e 's/INSTALLPREFIX/\/opt/g' -e "s/DEBVERSION/${VERSION}/g" -e "s/DEBPRODVERS/${PRODVERS}/g"`"
+
+	if [ "`echo "${QL}"|grep '\\$'`" ]; then
+		dpkg-query -f "${QL}" -W "${DEB}"
+	else
+		echo "${QL}"
+	fi
 	return 0
 }
 
@@ -354,6 +371,7 @@
 	if [[ $# -ne 2 ]]; then
 		return 1
 	fi
+	return 0
 	case $1 in
 	"installed")	# package installed, could be either partial or complete
 		rpm -q --quiet $2 > /dev/null 2>&1
--- /opt/SUNWut/bin/utselect.orig	2007-02-02 21:00:23.000000000 +0100
+++ /opt/SUNWut/bin/utselect	2007-02-02 21:00:49.000000000 +0100
@@ -223,7 +223,7 @@
 	}
 	set env(LC_ALL) "C"
 
-	set lf [open "|$path/utswitch -l | sort +2nr" r]
+	set lf [open "|$path/utswitch -l | sort -nrk 2" r]
 
 	if [info exists tmpLC_ALL] {
 		set env(LC_ALL) $tmpLC_ALL
--- /opt/SUNWut/sbin/utadm.orig	2006-10-30 00:33:48.000000000 +0100
+++ /opt/SUNWut/sbin/utadm	2006-10-30 00:25:26.000000000 +0100
@@ -207,9 +207,9 @@
 		else
 		  NETWORKS="${ETC_OPT_UT}/net/networks";
 		fi
-		DHCPCONFIG="/etc/dhcpd.conf"
+		DHCPCONFIG="/etc/dhcp3/dhcpd.conf";
 		GREP=grep	# XXX need to figure out which <===
-		INIT_DHCP="/etc/init.d/dhcpd";
+		INIT_DHCP="/etc/init.d/dhcp3-server";
 		if [[ -d "/etc/sysconfig/network-scripts" ]] ; then
 		  IFCONFIG_SCRIPT="/etc/sysconfig/network-scripts/ifcfg-"
 		  IFCONFIG_BOOT="ONBOOT=yes"
@@ -595,7 +595,7 @@
 function GetDHCPpid {
   # On Solaris the daemon is in.dhcpd, on Linux it is dhcpd
   # This pgrep finds it on both platforms
-  dhcppid=`pgrep dhcpd`
+  dhcppid=`pgrep dhcpd3`
 }
 
 
@@ -3103,6 +3103,7 @@
 	elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then
                 lease_file=/var/lib/dhcp/db/dhcpd.leases
         fi
+	lease_file=/var/lib/dhcp3/dhcpd.leases
 
 	rm -f $tmp_leases
         rm -f $dhcpd_hosts
--- /opt/SUNWut/sbin/utconfig.orig	2006-10-30 00:35:39.000000000 +0100
+++ /opt/SUNWut/sbin/utconfig	2006-10-30 00:23:56.000000000 +0100
@@ -157,7 +157,7 @@
     # Define Linux specific filenames
     #
     ETCSERVICES="/etc/services"
-    DHCPCONFIG="/etc/dhcpd.conf"
+    DHCPCONFIG="/etc/dhcp3/dhcpd.conf"
     #
     # On Linux gdbm is used instead of ndbm. Only one file is
     # needed for gdbm instead of the two needed for ndbm.
@@ -1747,23 +1747,23 @@
 SRDS_RN="2.2"
 SRDS_PACKAGE="SUNWutdso"
 
-if ! SRDSInstalled; then
-  Fatal "$SRDS_PN is not installed on this host"
-elif ! SRDSVersion $SRDS_RN; then
-  Fatal "$SRDS_PN $SRDS_RN is not installed on this host"
-elif SRDSInstallPartial; then
-  Fatal "$SRDS_PN $SRDS_RN is only partially installed"
-fi
+#if ! SRDSInstalled; then
+#  Fatal "$SRDS_PN is not installed on this host"
+#elif ! SRDSVersion $SRDS_RN; then
+#  Fatal "$SRDS_PN $SRDS_RN is not installed on this host"
+#elif SRDSInstallPartial; then
+#  Fatal "$SRDS_PN $SRDS_RN is only partially installed"
+#fi
 
 SRDS_BASEDIR="$(${G_MEDIA_DIR}/utprodinfo -r $SRDS_PACKAGE)/SUNWut"
 
 LCL_PROD_NAME="LDAP Client Libraries"
 
-if ! LdapClientInstalled; then
-  Fatal "$LCL_PROD_NAME is not installed on this host"
-elif LdapClientInstallPartial; then
-  Fatal "$LCL_PROD_NAME is only partially installed"
-fi
+#if ! LdapClientInstalled; then
+#  Fatal "$LCL_PROD_NAME is not installed on this host"
+#elif LdapClientInstallPartial; then
+#  Fatal "$LCL_PROD_NAME is only partially installed"
+#fi
 
 UT_ROOT_S="Sun Ray root"
 DEFAULT_ROOTENTRY="o=utdata"
--- /opt/SUNWut/sbin/utreplica.orig	2006-10-30 00:36:00.000000000 +0100
+++ /opt/SUNWut/sbin/utreplica	2006-10-21 23:24:29.000000000 +0200
@@ -1752,25 +1752,25 @@
 SRDS_NAME="Sun Ray Data store"
 SRDS_REL="2.2"
 SRDS_PACKAGE="SUNWutdso"
-if ! SunDSInstalled; then
-  Fatal "$SRDS_NAME is not installed on this host"
-elif ! SunDSVersion $SRDS_REL; then
-  Fatal "$SRDS_NAME $SRDS_REL is not installed on this host"
-elif SunDSInstallPartial; then
-  Fatal "$SRDS_NAME $SRDS_REL is only partially installed"
-fi
+#if ! SunDSInstalled; then
+#  Fatal "$SRDS_NAME is not installed on this host"
+#elif ! SunDSVersion $SRDS_REL; then
+#  Fatal "$SRDS_NAME $SRDS_REL is not installed on this host"
+#elif SunDSInstallPartial; then
+#  Fatal "$SRDS_NAME $SRDS_REL is only partially installed"
+#fi
 
 
 # check for LDAP Client libs
 LCL_PROD_NAME="LDAP Client Libraries"
 
-if [ -z $LCL_PACKAGE ]; then
-   Fatal "$LCL_PROD_NAME is not installed on this host"
-elif ! LdapClientInstalled; then
-   Fatal "$LCL_PROD_NAME is not installed on this host"
-elif LdapClientInstallPartial; then
-   Fatal "$LCL_PROD_NAME is only partially installed"
-fi
+#if [ -z $LCL_PACKAGE ]; then
+#   Fatal "$LCL_PROD_NAME is not installed on this host"
+#elif ! LdapClientInstalled; then
+#   Fatal "$LCL_PROD_NAME is not installed on this host"
+#elif LdapClientInstallPartial; then
+#   Fatal "$LCL_PROD_NAME is only partially installed"
+#fi
 
 # Ensure that utconfig has been utilised
 if [[ ! -f $UT_ADM_CONF ]]; then