Attachment 'sray311fcs-ubuntu-dapper.patch'
Download
Toggle line numbers
1 --- /opt/SUNWut/lib/utprodinfo.SUN Wed Aug 11 21:43:29 2004
2 +++ /opt/SUNWut/lib/utprodinfo Wed Aug 11 21:44:09 2004
3 @@ -339,7 +339,8 @@
4 # found no params, just return
5 return 0
6 fi
7 - rpm -q --queryformat ${MAPPEDLIST} $PKGNAME 2>/dev/null
8 + echo "/opt"
9 + #rpm -q --queryformat ${MAPPEDLIST} $PKGNAME 2>/dev/null
10 return 0
11 }
12
13 @@ -354,6 +355,7 @@
14 if [[ $# -ne 2 ]]; then
15 return 1
16 fi
17 + return 0
18 case $1 in
19 "installed") # package installed, could be either partial or complete
20 rpm -q --quiet $2 > /dev/null 2>&1
21 --- /opt/SUNWut/lib/utadmingid.orig 2004-12-15 16:31:44.000000000 +0000
22 +++ /opt/SUNWut/lib/utadmingid 2004-12-15 15:13:11.000000000 +0000
23 @@ -15,7 +15,7 @@
24 ETCDIR="/etc/opt/SUNWut"
25 UTADMINPW=${ETCDIR}/utadmin.pw
26 if [ -f $UTADMINPW ] ; then
27 - WEBGUI_GROUP=`/bin/ls -gn $UTADMINPW | /bin/awk '{print $3}' `
28 + WEBGUI_GROUP=`/bin/ls -gn $UTADMINPW | /usr/bin/awk '{print $3}' `
29 fi
30 WEBGUI_GROUP=${WEBGUI_GROUP:-root}
31 print $WEBGUI_GROUP
32 --- /opt/SUNWut/lib/dhcp/isc/utdhcpservice.orig 2005-08-24 20:08:49.000000000 +0200
33 +++ /opt/SUNWut/lib/dhcp/isc/utdhcpservice 2005-09-13 12:33:42.000000000 +0200
34 @@ -88,13 +88,19 @@
35
36 function StatusDHCP {
37 typeset PACKAGE="${DHCP_PACKAGE}"
38 - if $DHCP_INSTALLED ; then
39 - # get the actual package name including version and release
40 - PACKAGE="$(rpm -q ${DHCP_PACKAGE} 2> /dev/null)"
41 - fi
42 - if ! $DHCP_RUNNING && [ $DHCP_STATE != "unconfigured" ] ; then
43 - DHCP_STATE="disabled"
44 - fi
45 + DHCP_INSTALLED=true
46 + DHCP_ENABLED=true
47 + DHCP_CONFIGURED=true
48 + DHCP_RUNNING=true
49 + DHCP_PACKAGE="dhcp3-server"
50 + DHCP_STATE="online"
51 + #if $DHCP_INSTALLED ; then
52 + # # get the actual package name including version and release
53 + # PACKAGE="$(rpm -q ${DHCP_PACKAGE} 2> /dev/null)"
54 + #fi
55 + #if ! $DHCP_RUNNING && [ $DHCP_STATE != "unconfigured" ] ; then
56 + # DHCP_STATE="disabled"
57 + #fi
58 print "begin dhcpstate"
59 print "installed=${DHCP_INSTALLED}"
60 print "enabled=${DHCP_ENABLED}"
61 --- /opt/SUNWut/sbin/utconfig.orig 2006-10-03 02:15:46.000000000 +0200
62 +++ /opt/SUNWut/sbin/utconfig 2007-02-12 15:46:28.000000000 +0100
63 @@ -1747,23 +1747,23 @@
64 SRDS_RN="2.2"
65 SRDS_PACKAGE="SUNWutdso"
66
67 -if ! SRDSInstalled; then
68 - Fatal "$SRDS_PN is not installed on this host"
69 -elif ! SRDSVersion $SRDS_RN; then
70 - Fatal "$SRDS_PN $SRDS_RN is not installed on this host"
71 -elif SRDSInstallPartial; then
72 - Fatal "$SRDS_PN $SRDS_RN is only partially installed"
73 -fi
74 +#if ! SRDSInstalled; then
75 +# Fatal "$SRDS_PN is not installed on this host"
76 +#elif ! SRDSVersion $SRDS_RN; then
77 +# Fatal "$SRDS_PN $SRDS_RN is not installed on this host"
78 +#elif SRDSInstallPartial; then
79 +# Fatal "$SRDS_PN $SRDS_RN is only partially installed"
80 +#fi
81
82 SRDS_BASEDIR="$(${G_MEDIA_DIR}/utprodinfo -r $SRDS_PACKAGE)/SUNWut"
83
84 LCL_PROD_NAME="LDAP Client Libraries"
85
86 -if ! LdapClientInstalled; then
87 - Fatal "$LCL_PROD_NAME is not installed on this host"
88 -elif LdapClientInstallPartial; then
89 - Fatal "$LCL_PROD_NAME is only partially installed"
90 -fi
91 +#if ! LdapClientInstalled; then
92 +# Fatal "$LCL_PROD_NAME is not installed on this host"
93 +#elif LdapClientInstallPartial; then
94 +# Fatal "$LCL_PROD_NAME is only partially installed"
95 +#fi
96
97 UT_ROOT_S="Sun Ray root"
98 DEFAULT_ROOTENTRY="o=utdata"
99 --- /opt/SUNWut/sbin/utadm.orig 2006-10-03 02:15:45.000000000 +0200
100 +++ /opt/SUNWut/sbin/utadm 2007-02-12 16:36:00.000000000 +0100
101 @@ -932,7 +932,7 @@
102 fi
103
104 # get the intf's symbolic name
105 - INTF_NAME=`getent hosts ${INTF_IPA} | awk '{print $2}'`;
106 + INTF_NAME=`getent hosts | grep -w ${INTF_IPA} | awk '{print $2}'`;
107 if [ -z "${INTF_NAME}" ]; then
108 print -u2 "Error: host name for ${INTF_IPA} not found"
109 exit 1;
110 @@ -3098,8 +3098,8 @@
111 CountIPLeases() {
112 tmp_leases=/var/opt/SUNWut/tmp/tmpLeases.$$
113 dhcpd_hosts=/var/opt/SUNWut/tmp/dhcpdHosts.$$
114 - if [ -f /var/lib/dhcp/dhcpd.leases ]; then
115 - lease_file=/var/lib/dhcp/dhcpd.leases
116 + if [ -f /var/lib/dhcp3/dhcpd.leases ]; then
117 + lease_file=/var/lib/dhcp3/dhcpd.leases
118 elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then
119 lease_file=/var/lib/dhcp/db/dhcpd.leases
120 fi
121 --- /opt/SUNWut/sbin/utreplica.orig 2006-10-03 02:15:46.000000000 +0200
122 +++ /opt/SUNWut/sbin/utreplica 2007-02-12 15:47:47.000000000 +0100
123 @@ -1752,25 +1752,25 @@
124 SRDS_NAME="Sun Ray Data store"
125 SRDS_REL="2.2"
126 SRDS_PACKAGE="SUNWutdso"
127 -if ! SunDSInstalled; then
128 - Fatal "$SRDS_NAME is not installed on this host"
129 -elif ! SunDSVersion $SRDS_REL; then
130 - Fatal "$SRDS_NAME $SRDS_REL is not installed on this host"
131 -elif SunDSInstallPartial; then
132 - Fatal "$SRDS_NAME $SRDS_REL is only partially installed"
133 -fi
134 +#if ! SunDSInstalled; then
135 +# Fatal "$SRDS_NAME is not installed on this host"
136 +#elif ! SunDSVersion $SRDS_REL; then
137 +# Fatal "$SRDS_NAME $SRDS_REL is not installed on this host"
138 +#elif SunDSInstallPartial; then
139 +# Fatal "$SRDS_NAME $SRDS_REL is only partially installed"
140 +#fi
141
142
143 # check for LDAP Client libs
144 LCL_PROD_NAME="LDAP Client Libraries"
145
146 -if [ -z $LCL_PACKAGE ]; then
147 - Fatal "$LCL_PROD_NAME is not installed on this host"
148 -elif ! LdapClientInstalled; then
149 - Fatal "$LCL_PROD_NAME is not installed on this host"
150 -elif LdapClientInstallPartial; then
151 - Fatal "$LCL_PROD_NAME is only partially installed"
152 -fi
153 +#if [ -z $LCL_PACKAGE ]; then
154 +# Fatal "$LCL_PROD_NAME is not installed on this host"
155 +#elif ! LdapClientInstalled; then
156 +# Fatal "$LCL_PROD_NAME is not installed on this host"
157 +#elif LdapClientInstallPartial; then
158 +# Fatal "$LCL_PROD_NAME is only partially installed"
159 +#fi
160
161 # Ensure that utconfig has been utilised
162 if [[ ! -f $UT_ADM_CONF ]]; then
Attached Files
To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.You are not allowed to attach a file to this page.