[pkg-eucalyptus-commits] r101 - eucalyptus/trunk/debian
Chris Grzegorczyk
grze-guest at alioth.debian.org
Wed Oct 20 02:04:32 UTC 2010
Author: grze-guest
Date: 2010-10-20 02:04:24 +0000 (Wed, 20 Oct 2010)
New Revision: 101
Modified:
eucalyptus/trunk/debian/eucalyptus-cloud.postinst
eucalyptus/trunk/debian/eucalyptus-common.install
eucalyptus/trunk/debian/eucalyptus-common.postinst
eucalyptus/trunk/debian/eucalyptus-common.preinst
eucalyptus/trunk/debian/eucalyptus-java-common.postinst
eucalyptus/trunk/debian/eucalyptus-nc.install
Log:
updated with 2.0.0 files and upgrade path
Modified: eucalyptus/trunk/debian/eucalyptus-cloud.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cloud.postinst 2010-10-20 00:27:02 UTC (rev 100)
+++ eucalyptus/trunk/debian/eucalyptus-cloud.postinst 2010-10-20 02:04:24 UTC (rev 101)
@@ -2,9 +2,6 @@
if [ "$1" = "configure" ]
then
- if dpkg --compare-versions "$2" lt "1.6" ; then
- /usr/share/eucalyptus/euca_upgrade --old / --new / --db || true
- fi
if ! dpkg-statoverride --list /var/lib/eucalyptus/db >/dev/null 2>&1; then
chown eucalyptus:eucalyptus /var/lib/eucalyptus/db || true
chmod 700 /var/lib/eucalyptus/db || true
Modified: eucalyptus/trunk/debian/eucalyptus-common.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.install 2010-10-20 00:27:02 UTC (rev 100)
+++ eucalyptus/trunk/debian/eucalyptus-common.install 2010-10-20 02:04:24 UTC (rev 101)
@@ -1,12 +1,45 @@
-/var/log
/etc/eucalyptus/eucalyptus.conf
+/var/log/eucalyptus
+/var/run/eucalyptus
+/usr/share/eucalyptus/add_key.pl
/usr/share/eucalyptus/euca_ipt
/usr/share/eucalyptus/populate_arp.pl
/usr/share/eucalyptus/euca_upgrade
/usr/lib/eucalyptus/euca_rootwrap
+/usr/lib/eucalyptus/euca_mountwrap
+/etc/bash_completion.d/euca_conf
/usr/sbin/euca_conf
-/etc/bash_completion.d/euca_conf
/usr/sbin/euca_sync_key
/usr/sbin/euca_killall
/etc/eucalyptus/httpd.conf
/etc/eucalyptus/eucalyptus-version
+/usr/share/eucalyptus/connect_iscsitarget.pl
+/usr/share/eucalyptus/disconnect_iscsitarget.pl
+/usr/share/eucalyptus/get_iscsitarget.pl
+/usr/sbin/euca-add-user
+/usr/sbin/euca-add-user-group
+/usr/sbin/euca-delete-user
+/usr/sbin/euca-delete-user-group
+/usr/sbin/euca-deregister-cluster
+/usr/sbin/euca-deregister-storage-controller
+/usr/sbin/euca-deregister-walrus
+/usr/sbin/euca-describe-clusters
+/usr/sbin/euca-describe-properties
+/usr/sbin/euca-describe-storage-controllers
+/usr/sbin/euca-describe-user-groups
+/usr/sbin/euca-describe-users
+/usr/sbin/euca-describe-walruses
+/usr/sbin/euca-get-credentials
+/usr/sbin/euca-modify-property
+/usr/sbin/euca-register-cluster
+/usr/sbin/euca-register-storage-controller
+/usr/sbin/euca-register-walrus
+/usr/sbin/euca_admin/__init__.py
+/usr/sbin/euca_admin/clusters.py
+/usr/sbin/euca_admin/generic.py
+/usr/sbin/euca_admin/groups.py
+/usr/sbin/euca_admin/properties.py
+/usr/sbin/euca_admin/storagecontrollers.py
+/usr/sbin/euca_admin/users.py
+/usr/sbin/euca_admin/walruses.py
+
Modified: eucalyptus/trunk/debian/eucalyptus-common.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.postinst 2010-10-20 00:27:02 UTC (rev 100)
+++ eucalyptus/trunk/debian/eucalyptus-common.postinst 2010-10-20 02:04:24 UTC (rev 101)
@@ -16,13 +16,21 @@
then
# we prefer the new conf file and we saved
# a copy of the original one
- cp -f /etc/eucalyptus/eucalyptus.conf.dpkg-dist etc/eucalyptus/eucalyptus.conf
+ cp -f /etc/eucalyptus/eucalyptus.conf.dpkg-dist /etc/eucalyptus/eucalyptus.conf
fi
fi
- /usr/share/eucalyptus/euca_upgrade --old / --new / --conf || true
+ if [ -f /tmp/eucaback.dir ]; then
+ BACKDIR=`cat /tmp/eucaback.dir`
+ if [ -d "$BACKDIR" ]; then
+ /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --conf --keys --sameversion >/dev/null 2>&1 || true
+ fi
+ fi
+
else
euca_conf -d / -user eucalyptus -bridge br0 --hypervisor kvm --instances /var/lib/eucalyptus/instances --dhcpd /usr/sbin/dhcpd --dhcp_user dhcpd || true
fi
+ # debian KVM has disabled SCSI device-attach, make default virtio
+ sed -i "s/USE_VIRTIO_DISK=\"0\"/USE_VIRTIO_DISK=\"1\"/" /etc/eucalyptus/eucalyptus.conf
fi
chsh -s /bin/bash eucalyptus || true
Modified: eucalyptus/trunk/debian/eucalyptus-common.preinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.preinst 2010-10-20 00:27:02 UTC (rev 100)
+++ eucalyptus/trunk/debian/eucalyptus-common.preinst 2010-10-20 02:04:24 UTC (rev 101)
@@ -2,9 +2,23 @@
if [ "$1" = "upgrade" ];
then
- if dpkg --compare-versions "$2" lt 1.6
+ if dpkg --compare-versions "$2" lt "2.0"
then
cp -a /etc/eucalyptus/eucalyptus.conf /etc/eucalyptus/eucalyptus.conf.old
+ CWD=`pwd`
+ DATESTR=`date +%s`
+ echo /root/eucalyptus.backup.$DATESTR > /tmp/eucaback.dir
+ mkdir -p /root/eucalyptus.backup.$DATESTR
+ cd /root/eucalyptus.backup.$DATESTR
+ EUCABACKUPS=""
+ for i in $EUCADIR/var/lib/eucalyptus/keys/ $EUCADIR/var/lib/eucalyptus/db/ $EUCADIR/etc/eucalyptus/eucalyptus.conf $EUCADIR/etc/eucalyptus/eucalyptus-version $EUCADIR/usr/share/eucalyptus/
+ do
+ if [ -e $i ]; then
+ EUCABACKUPS="$EUCABACKUPS $i"
+ fi
+ done
+ tar cf - $EUCABACKUPS 2>/dev/null | tar xf - 2>/dev/null
+ cd $CWD
fi
fi
Modified: eucalyptus/trunk/debian/eucalyptus-java-common.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-java-common.postinst 2010-10-20 00:27:02 UTC (rev 100)
+++ eucalyptus/trunk/debian/eucalyptus-java-common.postinst 2010-10-20 02:04:24 UTC (rev 101)
@@ -1,5 +1,6 @@
#!/bin/sh -e
+#DEBHELPER#
if [ "$1" = "configure" ]; then
update-rc.d eucalyptus-cloud start 20 2 3 4 5 . stop 20 0 1 6 . >/dev/null || true
@@ -11,6 +12,23 @@
/etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
fi
+ if [ -f /tmp/eucaback.dir ]; then
+ BACKDIR=`cat /tmp/eucaback.dir`
+ if [ -d "$BACKDIR" ]; then
+ /usr/sbin/euca_conf -setup
+ if [ -f "$BACKDIR/etc/eucalyptus/eucalyptus-version" -a -f "/etc/eucalyptus/eucalyptus-version" ]; then
+ export OLDVERSION=`cat $BACKDIR/etc/eucalyptus/eucalyptus-version`
+ export NEWVERSION=`cat /etc/eucalyptus/eucalyptus-version`
+ if [ "$OLDVERSION" != "$NEWVERSION" ]; then
+ rm -f /usr/share/eucalyptus/eucalyptus-*$OLDVERSION*.jar
+# rm -f /usr/share/eucalyptus/asm2-2.2.3.jar
+ fi
+ fi
+ /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --db --sameversion >/dev/null 2>&1
+ /usr/sbin/euca_conf -setup
+ fi
+ fi
+
if which invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d eucalyptus-cloud start || true
else
@@ -19,5 +37,4 @@
fi
-#DEBHELPER#
-
+exit 0
Modified: eucalyptus/trunk/debian/eucalyptus-nc.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-nc.install 2010-10-20 00:27:02 UTC (rev 100)
+++ eucalyptus/trunk/debian/eucalyptus-nc.install 2010-10-20 02:04:24 UTC (rev 101)
@@ -1,11 +1,10 @@
-/usr/lib/eucalyptus/euca_mountwrap
-/etc/init.d/eucalyptus-nc
-/usr/share/eucalyptus/add_key.pl
-/usr/share/eucalyptus/detach.pl
/usr/share/eucalyptus/gen_libvirt_xml
/usr/share/eucalyptus/gen_kvm_libvirt_xml
+/usr/share/eucalyptus/partition2disk
/usr/share/eucalyptus/get_xen_info
/usr/share/eucalyptus/get_sys_info
-/usr/share/eucalyptus/partition2disk
+/usr/share/eucalyptus/detach.pl
/usr/sbin/euca_test_nc
/usr/lib/axis2/services/EucalyptusNC
+/etc/init.d/eucalyptus-nc
+
More information about the pkg-eucalyptus-commits
mailing list