[Xedeb-commits] jlbec commits r13 - in trunk: . debian/server
override/server/config/scripts
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Nov 30 16:21:00 CST 2005
Author: jlbec
Date: 2005-11-30 16:20:54 -0600 (Wed, 30 Nov 2005)
New Revision: 13
Added:
trunk/debian/server/oracle-xe.lintian
Modified:
trunk/
trunk/debian/server/
trunk/debian/server/control
trunk/debian/server/oracle-xe.install
trunk/debian/server/postinst
trunk/debian/server/postrm
trunk/debian/server/preinst
trunk/debian/server/prerm
trunk/debian/server/rules
trunk/override/server/config/scripts/oracle-xe
Log:
packagy stuff
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- .*.sw?
.*.stamp
oracle-xe-*
*.build
*.dsc
*.tar.gz
*.deb
tmp
+ .*.sw?
.*.stamp
oracle-xe-*
*.build
*.dsc
*.tar.gz
*.deb
*.changes
*.asc
tmp
Property changes on: trunk/debian/server
___________________________________________________________________
Name: svn:ignore
- oracle-xe
oracle-xe.init
tmp
*.debhelper
+ oracle-xe
oracle-xe.init
tmp
*.debhelper
files
Modified: trunk/debian/server/control
===================================================================
--- trunk/debian/server/control 2005-11-30 09:04:31 UTC (rev 12)
+++ trunk/debian/server/control 2005-11-30 22:20:54 UTC (rev 13)
@@ -11,5 +11,5 @@
Section: misc
Conflicts:
Description: Oracle Database 10g Express Edition
- This is the Express Edition of the Oracle Database 10g.
+ This is the Express Edition of the Oracle Database 10g.
Modified: trunk/debian/server/oracle-xe.install
===================================================================
--- trunk/debian/server/oracle-xe.install 2005-11-30 09:04:31 UTC (rev 12)
+++ trunk/debian/server/oracle-xe.install 2005-11-30 22:20:54 UTC (rev 13)
@@ -38,3 +38,4 @@
debian/tmp/usr/share/desktop-menu-files/oraclexe-gethelp.directory
debian/tmp/usr/share/desktop-menu-files/oraclexe-10g.directory
debian/tmp/usr/lib/oracle/xe/app/oracle/doc
+debian/tmp/usr/share/lintian/overrides
Added: trunk/debian/server/oracle-xe.lintian
===================================================================
--- trunk/debian/server/oracle-xe.lintian 2005-11-30 09:04:31 UTC (rev 12)
+++ trunk/debian/server/oracle-xe.lintian 2005-11-30 22:20:54 UTC (rev 13)
@@ -0,0 +1,6 @@
+oracle-xe: executable-not-elf-or-script
+oracle-xe: binary-or-shlib-defines-rpath
+oracle-xe: shlib-with-non-pic-code
+oracle-xe: image-file-in-usr-lib
+oracle-xe: manpage-has-errors-from-man usr/share/man/man1/impdp.1.gz
+oracle-xe: unstripped-binary-or-object ./usr/lib/oracle/xe/app/oracle/product/10.2.0/server/lib/hsdb_ora.so
Modified: trunk/debian/server/postinst
===================================================================
--- trunk/debian/server/postinst 2005-11-30 09:04:31 UTC (rev 12)
+++ trunk/debian/server/postinst 2005-11-30 22:20:54 UTC (rev 13)
@@ -3,26 +3,50 @@
#DEBHELPER#
echo "Executing Post-install steps.........."
-if `grep -q dba /etc/group`
+if `grep -q ^dba: /etc/group`
then
echo ""
else
/usr/sbin/groupadd dba
fi
-if `grep -q oraclexe /etc/passwd`
+id oracle > /dev/null
+status=$?
+if test $status -eq 0
then
- /usr/sbin/usermod -G dba oraclexe
+ groups oracle | grep dba > /dev/null
+ status=$?
+ if test $status != 0
+ then
+ /usr/sbin/usermod -G dba oracle
+ fi
else
- /usr/sbin/useradd -m -G dba -d /usr/lib/oracle/xe -s /bin/bash oraclexe
+ /usr/sbin/useradd -g dba -d /usr/lib/oracle/xe -s /bin/bash oracle
fi
-/bin/chown -R oraclexe:dba /usr/lib/oracle/xe
-#/sbin/ldconfig
+#if `grep -q oraclexe /etc/passwd`
+#then
+# /usr/sbin/usermod -G dba oraclexe
+#else
+# /usr/sbin/useradd -M -g dba -d /usr/lib/oracle/xe -s /bin/bash oraclexe
+#fi
+/bin/chown -R oracle:dba /usr/lib/oracle/xe
-/bin/chown -R oraclexe:dba /usr/lib/oracle/xe
+#if [ -d /etc/init.d ]
+#then
+# /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/init.d/oracle-xe
+mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/pixmaps
+#else
+# /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/rc.d/init.d/oracle-xe
+#fi
+chmod 755 /etc/init.d/oracle-xe
+/sbin/chkconfig --add oracle-xe
# SGA & PGA algo
+sgamin=146800640
+pgamin=16777216
+sgamax=805306368
+pgamax=268435456
TM=`cat /proc/meminfo | grep '^MemTotal' | awk '{print $2}'`
TM=`echo $TM / 1024 | bc`
TM=`echo 0.40 \* $TM | bc | sed "s/\..*//"`
@@ -31,26 +55,189 @@
pga_target=`echo 0.25 \* $TMSP | bc `
sga=`echo $sga_target \* 1048576 | bc | sed "s/\..*//"`
pga=`echo $pga_target \* 1048576 | bc | sed "s/\..*//"`
-check=`echo $sga \< 146800640 | bc`
+check=`echo $sga \< $sgamin | bc`
if test $check != 0
then
- sga=146800640
+ sga=$sgamin
fi
-check=`echo $pga \< 16777216 | bc`
+
+check=`echo $pga \< $pgamin | bc`
if test $check != 0
then
- pga=16777216
+ pga=$pgamin
fi
+if test `echo $sga + $pga \> $sgamax + $pgamax | bc`
+then
+ check=`echo $sga \> $sgamax | bc`
+ if test $check != 0
+ then
+ sga=$sgamax
+ fi
+
+ check=`echo $pga \> $pgamax | bc`
+ if test $check != 0
+ then
+ pga=$pgamax
+ fi
+fi
+
# init.ora parameters instantiation
/bin/sed -i "s/%sga_target%/$sga/g" /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/init.ora
/bin/sed -i "s/%pga_aggregate_target%/$pga/g" /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/init.ora
/bin/sed -i "s/%sga_target%/$sga/g" /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/initXETemp.ora
/bin/sed -i "s/%pga_aggregate_target%/$pga/g" /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/initXETemp.ora
+
chmod 6751 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/oracle
chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/sqlplus
+# Start Menu icons
+
+if test -d /var/lib/menu/kde/Applications/OracleXE
+then
+ echo ""
+else
+ mkdir -p /var/lib/menu/kde/Applications/OracleXE/GetHelp
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/.directory ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/.directory
+ ln -s /usr/share/desktop-menu-files/oraclexe-10g.directory /var/lib/menu/kde/Applications/OracleXE/.directory
+else
+ ln -s /usr/share/desktop-menu-files/oraclexe-10g.directory /var/lib/menu/kde/Applications/OracleXE/.directory
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-startdb.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-startdb.desktop
+ ln -s /usr/share/applications/oraclexe-startdb.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-startdb.desktop
+else
+ ln -s /usr/share/applications/oraclexe-startdb.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-startdb.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-stopdb.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-stopdb.desktop
+ ln -s /usr/share/applications/oraclexe-stopdb.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-stopdb.desktop
+else
+ ln -s /usr/share/applications/oraclexe-stopdb.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-stopdb.desktop
+fi
+
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-dbhp.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-dbhp.desktop
+ ln -s /usr/share/applications/oraclexe-dbhp.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-dbhp.desktop
+else
+ ln -s /usr/share/applications/oraclexe-dbhp.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-dbhp.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-getstarted.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-getstarted.desktop
+ ln -s /usr/share/applications/oraclexe-getstarted.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-getstarted.desktop
+else
+ ln -s /usr/share/applications/oraclexe-getstarted.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-getstarted.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-runsql.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-runsql.desktop
+ ln -s /usr/share/applications/oraclexe-runsql.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-runsql.desktop
+else
+ ln -s /usr/share/applications/oraclexe-runsql.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-runsql.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-backup.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-backup.desktop
+ ln -s /usr/share/applications/oraclexe-backup.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-backup.desktop
+else
+ ln -s /usr/share/applications/oraclexe-backup.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-backup.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-restore.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-restore.desktop
+ ln -s /usr/share/applications/oraclexe-restore.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-restore.desktop
+else
+ ln -s /usr/share/applications/oraclexe-restore.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-restore.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/.directory ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/.directory
+ ln -s /usr/share/desktop-menu-files/oraclexe-gethelp.directory /var/lib/menu/kde/Applications/OracleXE/GetHelp/.directory
+else
+ ln -s /usr/share/desktop-menu-files/oraclexe-gethelp.directory /var/lib/menu/kde/Applications/OracleXE/GetHelp/.directory
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-registerforonlineforum.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-registerforonlineforum.desktop
+ ln -s /usr/share/applications/oraclexe-registerforonlineforum.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-registerforonlineforum.desktop
+else
+ ln -s /usr/share/applications/oraclexe-registerforonlineforum.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-registerforonlineforum.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readdocumentation.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readdocumentation.desktop
+ ln -s /usr/share/applications/oraclexe-readdocumentation.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readdocumentation.desktop
+else
+ ln -s /usr/share/applications/oraclexe-readdocumentation.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readdocumentation.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-gotoonlineforum.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-gotoonlineforum.desktop
+ ln -s /usr/share/applications/oraclexe-gotoonlineforum.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-gotoonlineforum.desktop
+else
+ ln -s /usr/share/applications/oraclexe-gotoonlineforum.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-gotoonlineforum.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readonlinehelp.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readonlinehelp.desktop
+ ln -s /usr/share/applications/oraclexe-readonlinehelp.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readonlinehelp.desktop
+else
+ ln -s /usr/share/applications/oraclexe-readonlinehelp.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readonlinehelp.desktop
+fi
+
+if [ -f /etc/xdg/menus/applications.menu ]
+then
+ cp -r /usr/share/desktop-menu-files/oraclexe-10g.directory /usr/share/desktop-directories/oraclexe-10g.directory
+ cp -r /usr/share/desktop-menu-files/oraclexe-gethelp.directory /usr/share/desktop-directories/oraclexe-gethelp.directory
+ cp -r /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe.menu /etc/xdg/menus
+ (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp
+ cp -rf /tmp/applications.menu.tmp /etc/xdg/menus/applications.menu
+elif [ -f /etc/X11/desktop-menus/applications.menu ]
+then
+ (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp
+ cp -rf /tmp/applications.menu.tmp /etc/X11/desktop-menus/applications.menu
+fi
+
+homedir=`echo $HOME`
+if [ "$homedir" = "/root" ]
+then
+ homedir=`sh -c "echo ~$USER"`
+fi
+
+if [ "$homedir" != "/root" ]
+then
+ if [ -d $homedir/.gnome-desktop ]
+ then
+ cp /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/.gnome-desktop
+ fi
+ if [ -d $homedir/Desktop ]
+ then
+ cp /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/Desktop
+ fi
+fi
+
+rm -fr /tmp/applications.menu.tmp
rm -fr /usr/lib/oracle/screenrc
rm -fr /usr/lib/oracle/gtkrc
rm -fr /usr/lib/oracle/emacs
@@ -60,6 +247,8 @@
rm -fr /usr/lib/oracle/cshrc
rm -fr /usr/lib/oracle/bashrc-DEFAULT
rm -fr /usr/lib/oracle/bashrc_logout
-echo -e "You must run '/etc/init.d/oracle-xe configure' as root user to
+rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/admin/patch
+echo -e "You must run '/etc/init.d/oracle-xe configure' as the root user to
configure the database."
echo
+
Modified: trunk/debian/server/postrm
===================================================================
--- trunk/debian/server/postrm 2005-11-30 09:04:31 UTC (rev 12)
+++ trunk/debian/server/postrm 2005-11-30 22:20:54 UTC (rev 13)
@@ -2,22 +2,56 @@
#DEBHELPER#
-/sbin/ldconfig
-/bin/cp /etc/oratab /etc/oratab.xe
-/bin/sed -i -s '/XE:/d' /etc/oratab.xe
-/bin/cp /etc/oratab.xe /etc/oratab
-/bin/rm -f /etc/oratab.xe
-rm -fr /etc/init.d/oracle-xe
-rm -fr /etc/sysconfig/oracle-xe-config
+if [ -f /etc/oratab ]
+then
+ /bin/cp /etc/oratab /etc/oratab.xe
+ /bin/sed -i -s '/XE:/d' /etc/oratab.xe
+ /bin/cp /etc/oratab.xe /etc/oratab
+ /bin/rm -f /etc/oratab.xe
+fi
+
+rm -fr /etc/default/oracle-xe
rm -fr /usr/lib/oracle/xe/oradata/XE
rm -fr /usr/lib/oracle/xe/app/oracle/admin/XE
rm -fr /usr/lib/oracle/xe/app/oracle/flash_recovery_area
rm -fr /usr/lib/oracle/xe/app/oracle/admin/cfgtoollogs/dbca/XE
rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/server
-rm -fr /usr/share/desktop-menu-files/OracleXE.directory
-rm -fr /usr/share/desktop-menu-files/oraclexe-GetHelp.directory
+rm -fr /usr/lib/oracle/xe/app/oracle/doc
+rm -fr /usr/share/desktop-menu-files/oraclexe-10g.directory
+rm -fr /usr/share/desktop-menu-files/oraclexe-gethelp.directory
rm -fr /var/lib/menu/kde/Applications/OracleXE
-rm -fr /var/lib/menu/kde/Applications/oraclexe-OracleXE.directory
-rm -fr /var/lib/menu/kde/Applications/oraclexe-GetHelp.directory
-rm -fr /usr/share/gnome/vfolders/OracleXE.directory
-rm -fr /usr/share/gnome/vfolders/oraclexe-GetHelp.directory
+#rm -fr /var/lib/menu/kde/Applications/oraclexe-OracleXE.directory
+#rm -fr /var/lib/menu/kde/Applications/oraclexe-GetHelp.directory
+rm -fr /usr/share/gnome/vfolders/oraclexe-10g.directory
+rm -fr /usr/share/gnome/vfolders/oraclexe-gethelp.directory
+if [ -f /etc/xdg/menus/applications.menu ]
+then
+ rm -fr /usr/share/desktop-directories/oraclexe-10g.directory
+ rm -fr /usr/share/desktop-directories/oraclexe-gethelp.directory
+ rm -r /etc/xdg/menus/oraclexe.menu
+ sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu
+ cp -rf /tmp/applications.menu /etc/xdg/menus/applications.menu
+
+elif [ -f /etc/X11/desktop-menus/applications.menu ]
+then
+ sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu
+ cp -rf /tmp/applications.menu /etc/X11/desktop-menus/applications.menu
+fi
+
+rm -fr /tmp/applications.menu
+homedir=`echo $HOME`
+if [ "$homedir" = "/root" ]
+then
+ homedir=`sh -c "echo ~$USER"`
+fi
+
+if [ -f $homedir/.gnome-desktop/oraclexe-getstarteddesktop.desktop ]
+then
+ rm -fr $homedir/.gnome-desktop/oraclexe-getstarteddesktop.desktop
+fi
+
+if [ -f $homedir/Desktop/oraclexe-getstarteddesktop.desktop ]
+then
+ rm -fr $homedir/Desktop/oraclexe-getstarteddesktop.desktop
+fi
+
Modified: trunk/debian/server/preinst
===================================================================
--- trunk/debian/server/preinst 2005-11-30 09:04:31 UTC (rev 12)
+++ trunk/debian/server/preinst 2005-11-30 22:20:54 UTC (rev 13)
@@ -2,28 +2,30 @@
#DEBHELPER#
-#User must be root
+# User must be root
+
if [ $(id -u) != "0" ]
then
echo "You must be the root to install the software" >&2
exit 1
fi
-#ORACLE_BASE must be unset
+# ORACLE_BASE must be unset
if `env | grep -q ORACLE_BASE`
then
- echo The environment variable "ORACLE_BASE" is set. Unset it and restart the installation
- exit 1
+ /bin/csh -c "unsetenv ORACLE_BASE"
fi
-#Check for sufficient diskspace
+# Check for sufficient diskspace
if [ -d /usr/lib/oracle ]
then
diskspace=`df -k /usr/lib/oracle | grep '^/dev*' | awk '{print $4}'`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
- echo "Destination folder (/usr/lib/oracle) has insufficient disk space to install Oracle XE Server. Free up some space in this folder and retry the installation"
+ echo "You have insufficient diskspace in the destination directory (/usr/lib/oracle)
+to install Oracle Database 10g Express Edition. The installation requires at
+least 1.5 GB free on this disk."
exit 1
fi
else
@@ -31,7 +33,9 @@
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
- echo "Destination folder (/usr/lib) has insufficient disk space to install Oracle XE Server. Free up some space in this folder and retry the installation"
+ echo "You have insufficient diskspace in the destination directory (/usr/lib) to
+install Oracle Database 10g Express Edition. The installation requires at
+least 1.5 GB free on this disk."
exit 1
fi
fi
@@ -41,52 +45,62 @@
PhyMem=`expr $space / 1024`
swapspace=`free -m | grep Swap | awk '{print $4}'`
-if [ $PhyMem -lt 256 ]
+if [ $PhyMem -lt 240 ]
then
- echo "The system does not meet the minimum physical memory (RAM) requirement of 256 MB."
+ echo "Oracle Database 10g Express Edition requires a minimum of 256 MB of physical
+memory (RAM). This system has $PhyMem MB of RAM and does not meet minimum
+requirements."
exit 1
fi
-if [ $PhyMem -gt 0 ] && [ $PhyMem -lt 256 ]
+if [ $PhyMem -gt 0 ] && [ $PhyMem -le 256 ]
then
required=`expr 3 \* $PhyMem`
if [ $swapspace -lt "$required" ]
then
- echo " The system does not have the required swap space for Oracle XE to function. Make more swap space available and retry the installation"
+ echo "This system does not meet the minimum requirements for swap space. Based on
+the amount of physical memory available on the system, Oracle Database 10g
+Express Edition requires $required MB of swap space. This system has $swapspace MB
+of swap space. Configure more swap space on the system and retry the installation."
exit 1
fi
-elif [ $PhyMem -gt 256 ] && [ $PhyMem -lt 512 ]
+elif [ $PhyMem -gt 256 ] && [ $PhyMem -le 512 ]
then
required=`expr 2 \* $PhyMem`
if [ $swapspace -lt "$required" ]
then
- echo "The system does not have the required swap space for Oracle XE to function. Make more swap space available and retry the installation"
+ echo "This system does not meet the minimum requirements for swap space. Based on
+the amount of physical memory available on the system, Oracle Database 10g
+Express Edition requires $required MB of swap space. This system has $swapspace MB
+of swap space. Configure more swap space on the system and retry the installation."
exit 1
fi
-elif [ $PhyMem -gt 512 ] && [ $PhyMem -lt 2048 ]
+elif [ $PhyMem -gt 512 ] && [ $PhyMem -le 1024 ]
then
required=`echo 1.5 \* $PhyMem | bc`
+ if test `echo $required \> 1024 | bc`
+ then
+ required=1024
+ fi
+
check=`echo $swapspace \< $required | bc`
if test $check != 0
then
- echo " The system does not have the required swap space for Oracle XE to function. Make more swap space available and retry the installation"
+ echo "This system does not meet the minimum requirements for swap space. Based on
+the amount of physical memory available on the system, Oracle Database 10g
+Express Edition requires $required MB of swap space. This system has $swapspace MB
+of swap space. Configure more swap space on the system and retry the installation."
exit 1
fi
-elif [ $PhyMem -gt 2048 ] && [ $PhyMem -lt 8192 ]
+elif [ $PhyMem -gt 1024 ]
then
- if [$swapspace -lt "$PhyMem" ]
+ if [ $swapspace -lt 1024 ]
then
- echo " The system does not have the required swap space for Oracle XE to function. Make more swap space available and retry the installation"
+ echo "This system does not meet the minimum requirements for swap space. Based on
+the amount of physical memory available on the system, Oracle Database 10g
+Express Edition requires $PhyMem MB of swap space. This system has $swapspace MB
+of swap space. Configure more swap space on the system and retry the installation."
fi
-elif [ $PhyMem -gt 8192 ]
-then
- required=`echo 0.75 \* $PhyMem | bc`
- check=`echo $swapspace \< $required | bc`
- if test $check != 0
- then
- echo " The system does not have the required swap space for Oracle XE to function. Make more swap space available and retry the installation"
- exit 1
- fi
fi
@@ -134,52 +148,74 @@
if [ "$change" != "no" ]
then
- /sbin/sysctl -w kernel.sem="$semmsl $semmns $semopm $semmni" >> /etc/sysctl.conf > /dev/null
+ /sbin/sysctl -w kernel.sem="$semmsl $semmns $semopm $semmni" >> /etc/sysctl.conf
fi
if [ $shmmax -lt 536870912 ]
then
- /sbin/sysctl -w kernel.shmmax="536870912" >> /etc/sysctl.conf > /dev/null
+ kernel.shmmax="536870912"
+ changeshmmax=yes
fi
if [ $shmmni -lt 4096 ]
then
- /sbin/stysctl -w kernel.shmmni="4096" >> /etc/sysctl.conf > /dev/null
+ kernel.shmmni="4096"
+ changeshmmni=yes
fi
if [ $shmall -lt 2097152 ]
then
- /sbin/sysctl -w kernel.shmall="2097152" >> /etc/sysctl.conf > /dev/null
+ kernel.shmall="2097152"
+ changeshmall=yes
fi
if [ $filemax -lt 65536 ]
then
- /sbin/sysctl -w fs.file-max="65536" >> /etc/sysctl.conf > /dev/null
+ fs.file-max="65536"
+ changefilemax=yes
fi
+if [ "$changeshmmax" != "no" ]
+then
+ /sbin/sysctl -w kernel.shmmax="536870912" >> /etc/sysctl.conf
+fi
+
+if [ "$changeshmmni" != "no" ]
+then
+ /sbin/sysctl -w kernel.shmmni="4096" >> /etc/sysctl.conf
+fi
+
+if [ "$changeshmall" != "no" ]
+then
+ /sbin/sysctl -w kernel.shmall="2097152" >> /etc/sysctl.conf
+fi
+
+if [ "$changefilemax" != "no" ]
+then
+ /sbin/sysctl -w fs.file-max="65536" >> /etc/sysctl.conf
+fi
+
+changeport=no
if [ $ip_local_port_range_lb -lt 1024 ]
then
- change=yes
+ changeport=yes
ip_local_port_range_lb=1024
fi
if [ $ip_local_port_range_ub -gt 65000 ]
then
ip_local_port_range_ub=65000
- change=yes
+ changeport=yes
fi
-if [ "$change" != no ]
+if [ "$changeport" != "no" ]
then
- /sbin/sysctl -w net.ipv4.ip_local_port_range="$ip_local_port_range_lb $ip_local_port_range_ub" >> /etc/sysctl.conf > /dev/null
+ /sbin/sysctl -w net.ipv4.ip_local_port_range="$ip_local_port_range_lb $ip_local_port_range_ub" >> /etc/sysctl.conf
fi
-if [ "$change" != "no" ]
+if [ "$change" != "no" ] || [ "$changeport" != "no" ] || [ "$changeshmmax" != "no" ] || [ "$changeshmmni" != "no" ] || [ "$changeshmall" != "no" ] || [ "$changefilemax" != "no" ]
then
echo "########" >> /etc/sysctl.conf
/sbin/sysctl -p > /dev/null
fi
-
-#KernelVer=` uname -r | cut -f1 -d"-"`
-
Modified: trunk/debian/server/prerm
===================================================================
--- trunk/debian/server/prerm 2005-11-30 09:04:31 UTC (rev 12)
+++ trunk/debian/server/prerm 2005-11-30 22:20:54 UTC (rev 13)
@@ -2,7 +2,10 @@
#DEBHELPER#
-if [ -f "/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/stopdb.sh" ]; then
- /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/stopdb.sh
+if [ -f "/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/stopall.sh" ]; then
+ sh /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/stopall.sh
fi
+#rm -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/tnsnames.ora
+#rm -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/listener.ora
+#rm -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/postDBCreation.sql
Modified: trunk/debian/server/rules
===================================================================
--- trunk/debian/server/rules 2005-11-30 09:04:31 UTC (rev 12)
+++ trunk/debian/server/rules 2005-11-30 22:20:54 UTC (rev 13)
@@ -33,19 +33,21 @@
dh_installdirs
# Because the Makefile doesn't do this
- mkdir -p debian/tmp/usr/share/man/man1
- mkdir -p debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server
- mkdir -p debian/tmp/usr/lib/oracle/xe/app/oracle/doc
- mkdir -p debian/tmp/usr/share/applications
- mkdir -p debian/tmp/usr/share/pixmaps
- mkdir -p debian/tmp/usr/share/doc/oracle_xe
- mkdir -p debian/tmp/var/lib/menu/kde/Applications/OracleXE/GetHelp
- mkdir -p debian/tmp/usr/share/gnome/vfolders
- mkdir -p debian/tmp/usr/share/desktop-menu-files
- mkdir -p debian/tmp/etc/init.d
+ mkdir -p -m 0755 debian/tmp/usr/share/man/man1
+ mkdir -p -m 0755 debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server
+ mkdir -p -m 0755 debian/tmp/usr/lib/oracle/xe/app/oracle/doc
+ mkdir -p -m 0755 debian/tmp/usr/share/applications
+ mkdir -p -m 0755 debian/tmp/usr/share/pixmaps
+ mkdir -p -m 0755 debian/tmp/usr/share/doc/oracle_xe
+ mkdir -p -m 0755 debian/tmp/var/lib/menu/kde/Applications/OracleXE/GetHelp
+ mkdir -p -m 0755 debian/tmp/usr/share/gnome/vfolders
+ mkdir -p -m 0755 debian/tmp/usr/share/desktop-menu-files
+ mkdir -p -m 0755 debian/tmp/etc/init.d
$(MAKE) destroot=`pwd`/debian/tmp install
+ mkdir -p -m 0755 debian/tmp/usr/share/lintian/overrides
+ cp debian/oracle-xe.lintian debian/tmp/usr/share/lintian/overrides/oracle-xe
mv debian/tmp/etc/init.d/oracle-xe debian/oracle-xe.init
chmod 0755 debian/oracle-xe.init
Modified: trunk/override/server/config/scripts/oracle-xe
===================================================================
--- trunk/override/server/config/scripts/oracle-xe 2005-11-30 09:04:31 UTC (rev 12)
+++ trunk/override/server/config/scripts/oracle-xe 2005-11-30 22:20:54 UTC (rev 13)
@@ -22,6 +22,7 @@
then
. /lib/lsb/init-functions
elif [ -f /etc/init.d/functions ]
+then
. /etc/init.d/functions
fi
@@ -580,7 +581,7 @@
fi
stop
;;
- restart|reload)
+ restart|reload|force-reload)
stop
start
RETVAL=$?
@@ -599,7 +600,7 @@
;;
*)
- echo $"Usage: $0 {start|stop|restart|configure|status|enable|disable}"
+ echo $"Usage: $0 {start|stop|restart|force-reload|configure|status|enable|disable}"
exit 1
esac
More information about the Xedeb-commits
mailing list