Release 2.2.37

Signed-off-by: Stefano Cotta Ramusino <stefano.cotta@openmamba.org>

ChangeLog

@@ -1,6 +1,15 @@
+Changes in version 2.2.22 <silvan.calarco@mambasoft.it> 20110602
+- see git log
+---------------------------------------------------------------------------------
+
+Changes in version 2.2.21 <silvan.calarco@mambasoft.it> 20110522
+- see git log
+---------------------------------------------------------------------------------
+
 Changes in version 2.2.20 <silvan.calarco@mambasoft.it> 20110426
 - openmamba-update: moved from openmamba-release package
 - openmamba-netsrpms: new name of netsrpminstall.sh script with multiple package and automatic update support
+- git tag test
 ---------------------------------------------------------------------------------
 
 Changes in version 2.2.19 <silvan.calarco@mambasoft.it> 20110423

Makefile

@@ -1,5 +1,5 @@
 # Makefile for openmamba-desktop-base
-# Copyright (C) 2004-2009 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2004-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com>
 
 include VERSION
@@ -54,8 +54,6 @@ kdeconfigdir = ${kdedatadir}/config
 kdewallpapersdir = ${kdedatadir}/wallpapers
 localesdir = ${datadir}/locale
 kdelocalesdir = ${kdedatadir}/locale
-aptconfdir = ${sysconfdir}/apt/apt.conf.d
-aptscriptsdir = ${datadir}/apt/scripts
 
 xdg_appsdir = ${datadir}/applications
 xdg_directorydir = ${datadir}/desktop-directories
@@ -76,7 +74,7 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
 pck_kdedesktop = $(wildcard kde/desktop/*)
 #pck_srpms = flashplugin jre msttcorefonts win32codecs
-pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware
+pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack
 
 pck_infiles := $(wildcard kde/config/*.in \
                           kde/scripts/*.in \
@@ -113,6 +111,7 @@ pck_catalogs3 := $(wildcard usbinstall/po/*.po)
             s,@screensaver@,${SCREENSAVER},g;\
             s,@flashpluginver@,${FLASHPLUGIN_VERSION},g;\
             s,@win32codecsver@,${WIN32CODECS_VERSION},g;\
+            s,@virtualboxextensionpackver@,${VIRTUALBOX_EXTENSION_PACK_VERSION},g;\
             s,@skypever@,${SKYPE_VERSION},g" $< > $@
 
 all: dist-update locales
@@ -166,6 +165,7 @@ install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(kdewallpapersdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
+	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
 	cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
 	cp -r kde/apps $(DESTDIR)$(kdedatadir)
@@ -176,7 +176,7 @@ install-kde-distro-addons: dist-update
 	$(INSTALL_DATA) kde/wallpapers/$(WALLPAPER).desktop $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(COMPIZ_WALLPAPERS)} $(DESTDIR)$(mambaimagesdir)
-	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
+#	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
 
 install-distromenu: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(xdg_directorydir)
@@ -253,12 +253,6 @@ install-bootrecover:
 	$(INSTALL_SCRIPT) bootrecover/bootrecover.sh $(DESTDIR)$(bootrecoverdatadir)
 	$(INSTALL_DATA) bootrecover/openmamba-bootrecover.desktop $(DESTDIR)$(xdg_appsdir)
 
-install-apt-extras:
-	@$(INSTALL_DIR) $(DESTDIR)$(aptconfdir) $(DESTDIR)$(aptscriptsdir)
-	$(INSTALL_DATA) apt/post-install.conf $(DESTDIR)$(aptconfdir)
-	$(INSTALL_SCRIPT) apt/post-install.lua $(DESTDIR)$(aptscriptsdir)
-	$(INSTALL_SCRIPT) apt/post-install.sh $(DESTDIR)$(aptscriptsdir)
-
 install-usbinstall:
 	@$(INSTALL_DIR) $(DESTDIR)$(usbinstalldatadir)
 	$(INSTALL_SCRIPT) usbinstall/usbinstall.sh $(DESTDIR)$(usbinstalldatadir)
@@ -280,16 +274,10 @@ install: $(pck_infiles:.in=) \
 	install-openmamba-update \
 	install-bootrecover \
 	install-locales \
-	install-icons \
-	install-apt-extras
+	install-icons
 
 dist: clean
-	@case `sed 15q ChangeLog` in \
-	*"$(VERSION)"*) : ;; \
-	*) \
-	   echo "ChangeLog not updated; not releasing" 1>&2;\
-	   exit 1;; \
-	esac
+	@git log > ChangeLog.git
 	@mkdir /tmp/$(distdir)
 	@cp -a * /tmp/$(distdir)/
 	@rm -f $(dist_archive);\

SRPMS/flashplugin/distroutils.sysconfig

@@ -4,10 +4,10 @@
 #FLASH_PLUGIN_PCK=flashplayer9_install_linux_082207.tar.gz
 #FLASH_PLUGIN_PCK=flash-player-plugin-9.0.48.0.tar.bz2
 #FLASH_PLUGIN_PCK=install_flash_player_9_linux.tar.gz
-FLASH_PLUGIN_PCK=install_flash_player_10_linux.tar.gz
+FLASH_PLUGIN_PCK=install_flash_player_11_linux.i386.tar.gz
 
 # package URL (do not modify unless you know what you're doing)
 #FLASH_PLUGIN_URL=http://download.macromedia.com/pub/labs/flashplayer9_update/
 #FLASH_PLUGIN_URL=http://macromedia.rediris.es/rpmsource/
 #FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/current/
-FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/current/
+FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHPLUGIN_VERSION}/

SRPMS/msttcorefonts/distroutils.sysconfig

@@ -7,6 +7,7 @@ HAS_MS_LICENSE=no
 
 # Select the server that is closest to you by removing the '#'
 # character in one of the following lines:
+MSTTCF_URL=http://mesh.dl.sourceforge.net/project/corefonts/the%20fonts/final/
 #MSTTCF_URL=http://aleron.dl.sourceforge.net/sourceforge/corefonts
 #MSTTCF_URL=http://belnet.dl.sourceforge.net/sourceforge/corefonts
 #MSTTCF_URL=http://cesnet.dl.sourceforge.net/sourceforge/corefonts
@@ -15,5 +16,5 @@ HAS_MS_LICENSE=no
 #MSTTCF_URL=http://twtelecom.dl.sourceforge.net/sourceforge/corefonts
 #MSTTCF_URL=http://unc.dl.sourceforge.net/sourceforge/corefonts
 #MSTTCF_URL=http://umn.dl.sourceforge.net/sourceforge/corefonts
-MSTTCF_URL=http://easynews.dl.sourceforge.net/sourceforge/corefonts/
+#MSTTCF_URL=http://easynews.dl.sourceforge.net/sourceforge/corefonts/
 

SRPMS/msttcorefonts/msttcorefonts.spec.in

@@ -14,7 +14,7 @@
 
 Name:          %{name}
 Version:       1.3
-Release:       5@distroext@
+Release:       7@distroext@
 Summary:       TrueType core fonts for the web
 Group:         Graphical Desktop/Fonts
 Vendor:        @vendor@
@@ -30,11 +30,7 @@ BuildArch:     noarch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
-The TrueType core fonts for the web that was once available from
-http://www.microsoft.com/typography/fontpack/. The src rpm is cleverly
-constructed so that the actual fonts are downloaded from Sourceforge's site
-at build time. Therefore this package technically does not 'redistribute'
-the fonts, it just makes it easy to install them on a linux system.
+The TrueType core fonts for the web that was once available from http://www.microsoft.com/typography/fontpack/. The src rpm is cleverly constructed so that the actual fonts are downloaded from Sourceforge's site at build time. Therefore this package technically does not 'redistribute' the fonts, it just makes it easy to install them on a linux system.
 
 %prep
 rm -rf %{name}
@@ -101,6 +97,10 @@ exit 0
 %dir %{fontdir}
 
 %changelog
+* Wed Jun 01 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 1.3-7mamba
+- retry times raised to 5
+- replace use of wget with curl
+
 * Fri Feb 02 2007 Davide Madrisan <davide.madrisan@qilinux.it> 1.3-6qilnx
 - get download parameters from a sysconfig file
 

SRPMS/skype/skype.spec.in

@@ -7,7 +7,7 @@ Group:         Graphical Desktop/Applications/Internet
 Vendor:        @vendor@
 Distribution:  @distribution@
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://macromedia.rediris.es/
+URL:           http://www.skype.com
 Source:        LICENSE
 License:       Non Distributable
 BuildPrereq:   wget
@@ -38,15 +38,11 @@ tmpdir=$(mktemp -q -d -t skype.XXXXXXXX)
 
 wget -nv --timeout=10 --tries=2 \
    ${SKYPE_URL}${SKYPE_PCK} -P ${tmpdir}
-   
-SKYPE_ARCHIVE="`ls ${tmpdir}/skype-*`"
+
+SKYPE_ARCHIVE="`ls ${tmpdir}/*skype-* 2>/dev/null`"
 [ -f ${SKYPE_ARCHIVE} ] || exit 1
 
-if [ `echo ${SKYPE_ARCHIVE} | grep "tar.bz2$"` ]; then   
-   tar xjf ${SKYPE_ARCHIVE} --strip-components=1
-else
-   tar xzf ${SKYPE_ARCHIVE} --strip-components=1
-fi
+tar xf ${SKYPE_ARCHIVE} --strip-components=1
 
 %build -q
 

SRPMS/virtualbox-extension-pack/LICENSE

@@ -0,0 +1,34 @@
+VirtualBox PUEL terms and conditions
+License version 8, April 19, 2010
+
+ORACLE CORPORATION (“ORACLE”) IS WILLING TO LICENSE THE PRODUCT (AS DEFINED IN § 1 BELOW) TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS VIRTUALBOX PERSONAL USE AND EVALUATION LICENSE AGREEMENT (“AGREEMENT”). PLEASE READ THE AGREEMENT CAREFULLY. BY DOWNLOADING OR INSTALLING THIS PRODUCT, YOU ACCEPT THE FULL TERMS OF THIS AGREEMENT.
+
+IF YOU ARE AGREEING TO THIS LICENSE ON BEHALF OF AN ENTITY OTHER THAN AN INDIVIDUAL PERSON, YOU REPRESENT THAT YOU ARE BINDING AND HAVE THE RIGHT TO BIND THE ENTITY TO THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+
+§ 1 Subject of Agreement. “Product”, as referred to in this Agreement, shall be the binary software package “Oracle VM VirtualBox,” which Product allows for creating multiple virtual computers, each with different operating systems (“Guest Computers”), on a physical computer with a specific operating system (“Host Computer”), to allow for installing and executing these Guest Computers simultaneously. The Product consists of executable files in machine code for the Solaris, Windows, Linux, and Mac OS X operating systems as well as other data files as required by the executable files at run-time and documentation in electronic form. The Product includes all documentation and updates provided to You by Oracle under this Agreement and the terms of this Agreement will apply to all such documentation and updates unless a different license is provided with an update or documentation.
+
+§ 2 Grant of license. (1) Oracle grants you a personal, non-exclusive, non-transferable, limited license without fees to reproduce, install, execute, and use internally the Product a Host Computer for your Personal Use, Educational Use, or Evaluation. “Personal Use” requires that you use the Product on the same Host Computer where you installed it yourself and that no more than one client connect to that Host Computer at a time for the purpose of displaying Guest Computers remotely. “Educational use” is any use in an academic institution (schools, colleges and universities, by teachers and students). “Evaluation” means testing the Product for a reasonable period (that is, normally for a few weeks); after expiry of that term, you are no longer permitted to evaluate the Product.
+
+(2) The “VirtualBox Guest Additions” are a set of drivers and utilities that are shipped as a subset of the Product for the purpose of being installed inside a Guest Computer to improve its performance and cooperation with the rest of the Product. In addition to and independent of the rights granted by subsection 1, Oracle allows you to install, execute, copy and redistribute a) unmodified copies of the ISO installation medium of the VirtualBox Guest Additions as shipped with the Product and b) the VirtualBox Guest Additions together with the Guest Computer into which they have been installed.
+
+§ 3 Restrictions and Reservation of Rights. (1) Any use beyond the provisions of § 2 is prohibited. The Product and copies thereof provided to you under this Agreement are copyrighted and licensed, not sold, to you by Oracle. Oracle reserves all copyrights and other intellectual property rights. This includes, but is not limited to, the right to modify, make available or public, rent out, lease, lend or otherwise distribute the Product. This does not apply as far as applicable law may require otherwise or if Oracle grants you additional rights of use in a separate agreement in writing.
+
+(2) You may not do any of the following: (a) modify the Product. However if the documentation accompanying Product lists specific portions of Product, such as header files, class libraries, reference source code, and/or redistributable files, that may be handled differently, you may do so only as provided in the documentation; (b) rent, lease, lend or encumber the Product; (c) remove or alter any proprietary legends or notices contained in the Product; or (d) decompile, or reverse engineer the Product (unless enforcement of this restrictions is prohibited by applicable law).
+
+(3) The Product is not designed, licensed or intended for use in the design, construction, operation or maintenance of any nuclear facility and Oracle and its licensors disclaim any express or implied warranty of fitness for such uses.
+
+(4) No right, title or interest in or to any trademark, service mark, logo or trade name of Oracle or its licensors is granted under this Agreement.
+
+§ 4 Termination. The Agreement is effective on the Date you receive the Product and remains effective until terminated. Your rights under this Agreement will terminate immediately without notice from Oracle if you materially breach it or take any action in derogation of Oracle's and/or its licensors' rights to Product. Oracle may terminate this Agreement should any Product become, or in Oracle's reasonable opinion likely to become, the subject of a claim of intellectual property infringement or trade secret misappropriation. Upon termination, you will cease use of, and destroy, Product and confirm compliance in writing to Oracle. Sections 3-9, inclusive, will survive termination of the Agreement.
+
+§ 5 Disclaimer of Warranty. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, ORACLE PROVIDES THE PRODUCT “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. The entire risk as to the quality and performance of the Product is with you. Should it prove defective, you assume the cost of all necessary servicing, repair, or correction. In addition, Oracle shall be allowed to provide updates to the Product in urgent cases. You are then obliged to install such updates. Such an urgent case includes, but is not limited to, a claim of rights to the Product by a third party.
+
+§ 6 Limitation of Liability. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE PRODUCT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Oracle's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Product under this Agreement. Some states do not allow the exclusion of incidental or consequential damages, so some of the terms above may not be applicable to you.
+
+§ 7 Third Party Code. Portions of Product may be provided with notices and open source licenses from communities and third parties that govern the use of those portions, and any licenses granted hereunder do not alter any rights and obligations You may have under such open source licenses, however, the disclaimer of warranty and limitation of liability provisions in this Agreement will apply to all the Product.
+
+§ 8 Export Regulations. All Product, documents, technical data, and any other materials delivered under this Agreement are subject to U.S. export control laws and may be subject to export or import regulations in other countries. You agree to comply strictly with these laws and regulations and acknowledge that you have the responsibility to obtain any licenses to export, re-export, or import as may be required after delivery to you.
+
+§ 9 U.S. Government Restricted Rights. If Product is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Product and accompanying documentation will be only as set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
+
+§ 10 Miscellaneous. This Agreement is the entire agreement between you and Oracle relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. Course of dealing and other standard business conditions of the parties or the industry shall not apply. This Agreement is governed by the substantive and procedural laws of California and you and Oracle agree to submit to the exclusive jurisdiction of, and venue in, the courts in San Francisco, San Mateo, or Santa Clara counties in California in any dispute arising out of or relating to this Agreement.

SRPMS/virtualbox-extension-pack/distroutils.sysconfig

@@ -0,0 +1,7 @@
+## VirtualBox Extension Pack
+
+# package name (do not modify unless you know what you're doing)
+VIRTUALBOX_EXTENSION_PACK_PCK=Oracle_VM_VirtualBox_Extension_Pack-4.1.2-73507.vbox-extpack
+
+# package URL (do not modify unless you know what you're doing)
+VIRTUALBOX_EXTENSION_PACK_URL=http://download.virtualbox.org/virtualbox/4.1.2/

SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in

@@ -0,0 +1,60 @@
+%define pck_majver %(echo %version | cut -d. -f1-3)
+%define pck_minver %(echo %version | cut -d. -f4)
+Name:          virtualbox-extension-pack
+Version:       @virtualboxextensionpackver@
+Release:       1@distroext@
+Epoch:         1
+Summary:       VirtualBox Extension Pack
+Group:         Applications/Emulators
+Vendor:        @vendor@
+Distribution:  @distribution@
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           http://www.virtualbox.org/
+Source:        LICENSE
+License:       Not Distributable
+Requires(post):VirtualBox
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+
+%description
+VirtualBox Extension Pack.
+
+%prep
+%setup -c -n %{name}-%{version} -T
+
+[ -r /etc/sysconfig/@sysconfigfile@ ] || exit 1
+. /etc/sysconfig/@sysconfigfile@
+
+[ "${VIRTUALBOX_EXTENSION_PACK_PCK}" ] || exit 1
+[ "${VIRTUALBOX_EXTENSION_PACK_URL}" ] || exit 1
+
+wget -nv --timeout=10 --tries=2 \
+   ${VIRTUALBOX_EXTENSION_PACK_URL}${VIRTUALBOX_EXTENSION_PACK_PCK} -O ${VIRTUALBOX_EXTENSION_PACK_PCK}
+
+[ -f ${VIRTUALBOX_EXTENSION_PACK_PCK} ] || exit 1
+
+%build
+
+%install
+[ "%{buildroot}" != / ] && rm -rf %{buildroot}
+. /etc/sysconfig/@sysconfigfile@
+
+install -D -m0644 ${VIRTUALBOX_EXTENSION_PACK_PCK} %{buildroot}/opt/VirtualBox/extension/${VIRTUALBOX_EXTENSION_PACK_PCK}
+cp %{S:0} LICENSE
+
+%clean
+[ "%{buildroot}" != / ] && rm -rf %{buildroot}
+
+%post
+VBoxManage extpack uninstall Oracle_VM_VirtualBox_Extension_Pack || true
+VBoxManage extpack install /opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}-%{pck_minver}.vbox-extpack
+# --replace not working
+:
+
+%files
+%defattr(-,root,root)
+/opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}-%{pck_minver}.vbox-extpack
+%doc LICENSE
+
+%changelog
+* Tue Aug 16 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.2.73507-1mamba
+- specfile created

SRPMS/win32codecs/win32codecs.spec.in

@@ -69,20 +69,20 @@ rm -f $tmpfile
 
 [ "$tarball" ] || exit 1
 
-# check if the latest version is already installed
-if [ -r %{win32dir}/VERSION_w32codecs ]; then
-   currver="$(cat %{win32dir}/VERSION_w32codecs)"
-   case "$tarball" in
-   "all-${currver}.tar.bz2")
-      echo "the latest version is already installed"
-      exit 1 ;;
-   esac
-fi
+## check if the latest version is already installed
+#if [ -r %{win32dir}/VERSION_w32codecs ]; then
+#   currver="$(cat %{win32dir}/VERSION_w32codecs)"
+#   case "$tarball" in
+#   "all-${currver}.tar.bz2")
+#      echo "the latest version is already installed"
+#      exit 1 ;;
+#   esac
+#fi
 
 curl --url $URL/$tarball -o $tarball || exit 1
 echo $tarball | sed 's/all-\([0-9]*\).tar.*/\1/' > VERSION_w32codecs
 
-tar xjf $tarball && rm -f $tarball
+tar xf $tarball --strip-components=1 && rm -f $tarball
 
 %build
 

SRPMSVERSIONS

@@ -1,3 +1,4 @@
-FLASHPLUGIN_VERSION=10.2.153.1
+FLASHPLUGIN_VERSION=11.1.102.55
 WIN32CODECS_VERSION=20110131
-SKYPE_VERSION=2.2.0.25
+SKYPE_VERSION=2.2.0.35
+VIRTUALBOX_EXTENSION_PACK_VERSION=4.1.2.73507

VERSION

@@ -1,2 +1 @@
-VERSION = 2.2.20
-
+VERSION = 2.2.37

apt/post-install.conf

@@ -1,2 +0,0 @@
-Scripts::PM::Post:: "post-install.lua";
-Apt::Get::post-install "true";

apt/post-install.lua

@@ -1,12 +0,0 @@
--- This script will perform operations after new packages have been installed
---
--- Author: Silvan Calarco <silvan.calarco@qilinux.it> Copyright (c) 2009
---
-
--- Allow someone to disable this without removing the script.
-if confget("APT::Get::post-install/b", "true") == "false" then
-   return
-end
-
-os.execute("/usr/share/apt/scripts/post-install.sh")
-return

apt/post-install.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-[ -x /usr/bin/update-mime-database ] && update-mime-database /usr/share/mime >/dev/null
-IFS=":"
-for d in $XDG_DATA_DIRS; do
-   [ -x /usr/bin/update-desktop-database ] && update-desktop-database -q $d/applications/ >/dev/null
-done
-exit 0

bootrecover/bootrecover.kmdr

@@ -305,7 +305,7 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>Copyright (c) 2007-2010 by Silvan Calarco
+                    <string>Copyright (c) 2007-2011 by Silvan Calarco
 Released under the terms of the GNU GPL v3 license</string>
                 </property>
                 <property name="textFormat">
@@ -426,128 +426,6 @@ This tool is also useful before the installation of a third party boot manager i
                 <set>AlignCenter</set>
             </property>
         </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>setlabel</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>540</x>
-                    <y>40</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="populationText">
-                <string></string>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@execBegin
-@if (@devicesbox.currentItem &gt;= 0)
-   currdev=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
-   @showdevice.setText(@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0))
-   @dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, true)
-   @BackBox.setChecked(true)
-
-   parent_udi=`hal-find-by-property  --key block.device --string /dev/$currdev`
-   #
-   # set MBR combo box
-   #
-   dcop @dcopid KommanderIf "clear(QString)" mbrbox
-   storages=`hal-find-by-capability --capability storage`
-   dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "$currdev (@i18n("System partition"))" 0
-   for udi in $storages; do
-      device=`hal-get-property --udi $udi --key block.device`
-      hotpluggable=`hal-get-property --udi $udi --key storage.hotpluggable` || hotpluggable="false"
-      partscheme=`hal-get-property --udi $udi --key storage.partitioning_scheme`
-      if [ "$partscheme" == "mbr" -a "$hotpluggable" != "true" ]; then
-         dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "${device:5:5} (master boot record)" 0
-      fi
-   done
-   dcop @dcopid KommanderIf "setCurrentItem(int)" 0
-@endif
-@execEnd
-@setBootableCheckbox.execute()</string>
-                </stringlist>
-            </property>
-        </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>scanDevices</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>540</x>
-                    <y>0</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@devicesbox.clear
-@BackBox.setChecked(false)
-@NextBox.setChecked(false)
-@execBegin
-volumes=`hal-find-by-capability --capability volume`
-partlabel=
-
-for udi in $volumes; do
-   device=`hal-get-property --udi $udi --key block.device`
-   parent_udi=`hal-get-property --udi $udi --key block.storage_device`
-   hotpluggable=`hal-get-property --udi $parent_udi --key storage.hotpluggable` || hotpluggable="false"
-   blocksize=`hal-get-property --udi $udi --key volume.block_size`
-   numblocks=`hal-get-property --udi $udi --key volume.num_blocks`
-   volsize=`expr $blocksize \* $numblocks / 1024 / 1024`
-   volname=`hal-get-property --udi $udi --key volume.label`
-   [ "$volname" ] || volname="unnamed"
-   parttype=`hal-get-property --udi $udi --key volume.partition.type`
-   [ "$parttype" ] || parttype="unknown"
-   partscheme=`hal-get-property --udi $udi --key volume.partition.scheme`
-   [ "$partscheme" ] || partscheme="unknown"
-   fstype=`hal-get-property --udi $udi --key volume.fstype`
-   [ "$fstype" ] || fstype="unformatted"
-   is_mounted=`hal-get-property --udi $udi --key volume.is_mounted`
-   [ "$is_mounted" = "true" ] || {
-      mkdir /mnt/${device:5:5} &amp;&amp; mount $device /mnt/${device:5:5}
-   }
-   mount_point=`hal-get-property --udi $udi --key volume.mount_point`
-   add_info=""
-   [ "$hotpluggable" = "true" ] &amp;&amp; {
-      add_info=",removable"
-      [ @removablebox.checked == 1 ] || continue
-   }
-   if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
-      partlabel="$partlabel&lt;br&gt;${device:5:5} $fstype $volname $volsize MB"
-      case "$parttype" in
-         0x82) ;;
-         0x83)
-            [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
-               release=`cat $mount_point/etc/openmamba-release`
-               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point ($fstype,$volname,$volsize MB${add_info})" 0
-            }
-            ;;
-         *) ;;
-      esac
-   elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
-      case "$fstype" in
-         swap|iso9660) ;;
-         ext2|ext3|reiserfs|unformatted)
-           [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
-               release=`cat $mount_point/etc/openmamba-release`
-               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point $volsize MB ($release)" 0
-            }
-            ;;
-         *) ;;
-      esac
-   fi
-done
-@execEnd
-</string>
-                </stringlist>
-            </property>
-        </widget>
         <widget class="GroupBox">
             <property name="name">
                 <cstring>PartitionBox</cstring>
@@ -601,27 +479,6 @@ done
                     <set>WordBreak|AlignTop</set>
                 </property>
             </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>showdevice</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>230</x>
-                        <y>340</y>
-                        <width>280</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>Label3</cstring>
@@ -667,6 +524,158 @@ done
                     </stringlist>
                 </property>
             </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>showdevice</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>180</x>
+                        <y>340</y>
+                        <width>350</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string></string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>scanDevices</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>540</x>
+                    <y>0</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@devicesbox.clear
+@BackBox.setChecked(false)
+@NextBox.setChecked(false)
+@execBegin
+function get_udisks_key() {
+   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
+}
+devices=`udisks --enumerate-device-files | grep -v /dev/disk | sort -n -r`
+partlabel=
+
+for device in $devices; do
+   native_path=`get_udisks_key $device native-path`
+   [ -e $native_path/partition ] || continue
+   is_system_internal=`get_udisks_key $device "system internal"`
+   volsize=`get_udisks_key $device size`
+   volsize=`expr $volsize / 1024 / 1024`
+   volname=`get_udisks_key $device label`
+   [ "$volname" ] || volname="unnamed"
+   parttype=`get_udisks_key $device usage`
+   [ "$parttype" ] || parttype="unknown"
+   partscheme=`get_udisks_key $device scheme`
+   [ "$partscheme" ] || partscheme="unknown"
+   fstype=`get_udisks_key $device type`
+   [ "$fstype" ] || fstype="unformatted"
+   add_info=""
+   is_mounted=`get_udisks_key $device "is mounted"`
+   [ "$is_mounted" = "1" ] || {
+      mkdir /mnt/${device:5:5} &amp;&amp; mount $device /mnt/${device:5:5}
+   }
+   mount_point=`get_udisks_key $device "mount paths"`
+   add_info=""
+   [ "$is_system_internal" == "1" ] || {
+      add_info=",removable"
+      [ @removablebox.checked == 1 ] || continue
+   }
+
+   if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
+      partlabel="$partlabel&lt;br&gt;${device:5:5} $fstype $volname $volsize MB"
+      case "$fstype" in
+         ext2|ext3|ext4|reiserfs|reiser4)
+            [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
+               release=`cat $mount_point/etc/openmamba-release`
+               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point ($fstype,$volname,$volsize MB${add_info})" 0
+            }
+            ;;
+         *) ;;
+      esac
+   elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
+      case "$fstype" in
+         swap|iso9660) ;;
+         ext2|ext3|ext4|reiserfs|reiser4)
+           [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
+               release=`cat $mount_point/etc/openmamba-release`
+               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point $volsize MB ($release)" 0
+            }
+            ;;
+         *) ;;
+      esac
+   fi
+done
+@execEnd
+</string>
+                </stringlist>
+            </property>
+        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>setlabel</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>540</x>
+                    <y>40</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="populationText">
+                <string></string>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@execBegin
+function get_udisks_key() {
+   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
+}
+@if (@devicesbox.currentItem &gt;= 0)
+   currdev=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
+   @showdevice.setText(@devicesbox.item(@devicesbox.currentItem))
+   @dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, true)
+   @BackBox.setChecked(true)
+
+   #
+   # set MBR combo box
+   #
+   dcop @dcopid KommanderIf "clear(QString)" mbrbox
+   devices=`udisks --enumerate-device-files | grep -v /dev/disk`
+   dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "$currdev (@i18n("System partition"))" 0
+
+   for device in $devices; do
+      native_path=`get_udisks_key $device native-path`
+      [ -e $native_path/partition ] &amp;&amp; continue
+      is_system_internal=`get_udisks_key $device "system internal"`
+      partscheme=`get_udisks_key $device scheme`
+      if [ "$is_system_internal" == "1" -o "@removablebox.checked" == "1" ]; then
+         [ "$partscheme" == "mbr" ] &amp;&amp; \
+            dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "${device:5:5} (master boot record)" 0
+      fi
+   done
+   dcop @dcopid KommanderIf "setCurrentItem(int)" 0
+@endif
+@execEnd
+@setBootableCheckbox.execute()
+</string>
+                </stringlist>
+            </property>
         </widget>
     </widget>
     <widget class="QWidget">
@@ -837,41 +846,6 @@ done
                     <set>WordBreak|AlignTop</set>
                 </property>
             </widget>
-            <widget class="ScriptObject">
-                <property name="name">
-                    <cstring>setBootableCheckbox</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>false</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>520</x>
-                        <y>70</y>
-                        <width>32</width>
-                        <height>32</height>
-                    </rect>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string>@execBegin
-mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
-mbrpart=${mbrdevice:3:2}
-if [ "$mbrpart" ]; then
-   if [ $mbrpart -le 4 ]; then
-      dcop @dcopid KommanderIf setEnabled bootableBox true
-   else
-      dcop @dcopid KommanderIf setEnabled bootableBox false
-      dcop @dcopid KommanderIf setChecked bootableBox false
-   fi
-else
-   dcop @dcopid KommanderIf setEnabled bootableBox false
-fi
-@execEnd
-</string>
-                    </stringlist>
-                </property>
-            </widget>
             <widget class="ListBox">
                 <property name="name">
                     <cstring>chainloadbox</cstring>
@@ -907,6 +881,41 @@ fi
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
+            <widget class="ScriptObject">
+                <property name="name">
+                    <cstring>setBootableCheckbox</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>false</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>520</x>
+                        <y>70</y>
+                        <width>32</width>
+                        <height>32</height>
+                    </rect>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string>@execBegin
+mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
+mbrpart=${mbrdevice:3:2}
+if [ "$mbrpart" ]; then
+   if [ $mbrpart -le 4 ]; then
+      dcop @dcopid KommanderIf setEnabled bootableBox true
+   else
+      dcop @dcopid KommanderIf setEnabled bootableBox false
+      dcop @dcopid KommanderIf setChecked bootableBox false
+   fi
+else
+   dcop @dcopid KommanderIf setEnabled bootableBox false
+fi
+@execEnd
+</string>
+                    </stringlist>
+                </property>
+            </widget>
         </widget>
         <widget class="ScriptObject">
             <property name="name">
@@ -927,38 +936,39 @@ fi
 @chainloadbox.clear
 @setBootableCheckbox.execute()
 @execBegin
+function get_udisks_key() {
+   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
+}
 installdevice=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
-volumes=`hal-find-by-capability --capability volume`
+devices=`udisks --enumerate-device-files | grep -v /dev/disk | sort -n -r`
 partlabel=
 
-for udi in $volumes; do
-   device=`hal-get-property --udi $udi --key block.device`
-   [ "${device:5:5}" = "$installdevice" ] &amp;&amp; continue
-   parent_udi=`hal-get-property --udi $udi --key block.storage_device`
-   hotpluggable=`hal-get-property --udi $parent_udi --key storage.hotpluggable` || hotpluggable="false"
-   blocksize=`hal-get-property --udi $udi --key volume.block_size`
-   numblocks=`hal-get-property --udi $udi --key volume.num_blocks`
-   volsize=`expr $blocksize \* $numblocks / 1024 / 1024`
+for device in $devices; do
+   native_path=`get_udisks_key $device native-path`
+   [ -e $native_path/partition ] || continue
+   is_system_internal=`get_udisks_key $device "system internal"`
+   volsize=`get_udisks_key $device size`
+   volsize=`expr $volsize / 1024 / 1024`
    [ $volsize = 0 ] &amp;&amp; continue
-   volname=`hal-get-property --udi $udi --key volume.label`
-   mount_point=`hal-get-property --udi $udi --key volume.mount_point`
+   volname=`get_udisks_key $device label`
    [ "$volname" ] || volname="unnamed"
-   parttype=`hal-get-property --udi $udi --key volume.partition.type`
+   parttype=`get_udisks_key $device usage`
    [ "$parttype" ] || parttype="unknown"
-   partscheme=`hal-get-property --udi $udi --key volume.partition.scheme`
+   partscheme=`get_udisks_key $device scheme`
    [ "$partscheme" ] || partscheme="unknown"
-   fstype=`hal-get-property --udi $udi --key volume.fstype`
+   fstype=`get_udisks_key $device type`
    [ "$fstype" ] || fstype="unformatted"
    add_info=""
-   [ "$hotpluggable" = "true" ] &amp;&amp; {
+   [ "$is_system_internal" = "1" ] || {
       add_info=",removable"
       [ @removablebox.checked == 1 ] || continue
    }
+
    if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
       partlabel="$partlabel&lt;br&gt;${device:5:5} $fstype $volname $volsize MB"
-      case "$parttype" in
-         0x82) ;;
-         0x83) ;;
+      case "$fstype" in
+         swap|iso9660|unformatted) ;;
+         ext2|ext3|ext4|reiserfs|reiser4|unformatted) ;;
          *) dcop @dcopid KommanderIf "addListItem(QString,QString,int)" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})" 0
 	    dcop @dcopid KommanderIf "setSelection" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})"
          ;;
@@ -966,7 +976,7 @@ for udi in $volumes; do
    elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
       case "$fstype" in
          swap|iso9660|unformatted) ;;
-         ext2|ext3|reiserfs) ;;
+         ext2|ext3|ext4|reiserfs|reiser4) ;;
          *) dcop @dcopid KommanderIf "addListItem(QString,QString,int)" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})" 0
 	    dcop @dcopid KommanderIf "setSelection" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})"
          ;;
@@ -1025,6 +1035,33 @@ done
                 <set>AlignCenter</set>
             </property>
         </widget>
+        <widget class="TextEdit">
+            <property name="name">
+                <cstring>installlog</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>20</x>
+                    <y>60</y>
+                    <width>540</width>
+                    <height>360</height>
+                </rect>
+            </property>
+            <property name="hScrollBarMode">
+                <enum>AlwaysOn</enum>
+            </property>
+            <property name="textFormat">
+                <enum>LogText</enum>
+            </property>
+            <property name="populationText">
+                <string></string>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string></string>
+                </stringlist>
+            </property>
+        </widget>
         <widget class="ScriptObject">
             <property name="name">
                 <cstring>launchinstall</cstring>
@@ -1078,7 +1115,7 @@ _EOF
 
 @if (@confirmBox.checked); then
    @dcop(@dcopid, KommanderIf, setEnabled(QString,bool), back, false)
-   @exec("/usr/share/openmamba/bootrecover/bootrecover.sh -y @dcopid &amp;&gt; ~/.bootrecover.log")
+   @exec("sudo /usr/share/openmamba/bootrecover/bootrecover.sh ~/.bootrecover.conf @dcopid `whoami` &amp;&gt; ~/.bootrecover.log")
    @execBegin
       dcop @dcopid KommanderIf setText installlog "`cat ~/.bootrecover.log`"
    @execEnd
@@ -1113,33 +1150,6 @@ _EOF
                 </stringlist>
             </property>
         </widget>
-        <widget class="TextEdit">
-            <property name="name">
-                <cstring>installlog</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>20</x>
-                    <y>60</y>
-                    <width>540</width>
-                    <height>360</height>
-                </rect>
-            </property>
-            <property name="hScrollBarMode">
-                <enum>AlwaysOn</enum>
-            </property>
-            <property name="textFormat">
-                <enum>LogText</enum>
-            </property>
-            <property name="populationText">
-                <string></string>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string></string>
-                </stringlist>
-            </property>
-        </widget>
     </widget>
 </widget>
 <images>

bootrecover/bootrecover.sh

@@ -1,13 +1,12 @@
 # openmamba boot loader recovery script
-# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPLv3 License
 
-VERSION=0.6
+VERSION=0.7
 TEXTDOMAIN=bootrecover
 TEXTDOMAINDIR=/opt/kde3/share/locale/
 INSTALL_DATE=`date +%Y%m%d-%H%M`
-INPUT_FILE=~/.bootrecover.conf
 LOG_FILE=/var/log/bootrecover-$INSTALL_DATE.log
 MOUNTPOINT=/mnt/install
 KERNEL_RELEASE=`uname -r`
@@ -72,70 +71,23 @@ Installation time: $TIME_ELAPSED minutes"
    done
 }
 
-function find_driver_for_udi() {
-   local found_driver parent_udi
+export PATH=$PATH:/sbin:/usr/sbin:/opt/kde3/bin
 
-   parent_udi=$1
-   while [ ! "$found_driver" -a "$parent_udi" != "/org/freedesktop/Hal/devices/computer" ]; do
-      parent_udi=`hal-get-property --udi $parent_udi --key info.parent 2>/dev/null`
-      [ "`hal-get-property --udi $parent_udi --key info.bus 2>/dev/null`" = "pci" ] &&
-         found_driver=`hal-get-property --udi $parent_udi --key info.linux.driver 2>/dev/null`
-   done
-   if [ "$found_driver" ]; then
-      echo $found_driver
-      return 0
-   else
-      return 1
-   fi
-}
-
-function find_remapped_device() {
-
-   local REMAPPED_INSTALL_DEVICE
-
-   tempfile=`tempfile 2>/dev/null`
-   mapfile=`tempfile 2>/dev/null`
-
-   # generate current volumes sorted list with driver information
-   storages=`hal-find-by-capability --capability storage`
-   for s in $storages; do
-      device=`hal-get-property --udi $s --key block.device`
-      linux_driver=`find_driver_for_udi $s`
-      [ "${device:5:2}" = "sd" ] && \
-         echo "${device:0:8} $linux_driver" >> $tempfile
-   done
-   # sort
-   cat $tempfile|sort > $mapfile
-   rm -f $tempfile
-
-   LETTERS=(a b c d e f g h i j k l m n o p q r s t u v w x y z)
-
-   CURR_DRIVE_LETTER=0
-   while read line; do
-      set -- $line
-      [ "$1" = "$INSTALL_DISK_DEVICE" ] && REMAPPED_INSTALL_DEVICE="${INSTALL_DEVICE:0:7}${LETTERS[CURR_DRIVE_LETTER]}${INSTALL_DEVICE:8:2}"
-      [ "$2" = "$INSTALL_DRIVER" ] && {
-         DEV_NAME_ORIG=(${DEV_NAME_ORIG[*]} $1)
-         DEV_NAME_DEST=(${DEV_NAME_DEST[*]} ${1:0:7}${LETTERS[CURR_DRIVE_LETTER]})
-         let CURR_DRIVE_LETTER+=1
-      }
-   done < $mapfile
-   [ "$REMAPPED_INSTALL_DEVICE" ] || REMAPPED_INSTALL_DEVICE=$INSTALL_DEVICE
-   echo $REMAPPED_INSTALL_DEVICE
-
-   rm -f $mapfile
-   rm -f $tmpfile
-}
-
-DCOPID=$2
+INPUT_FILE=$1
+[ "$2" -a "$3" ] && DCOPID="--user $3 $2"
 
 echo $"\
 openmamba boot loader recovery script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 "
 
 dcop_write $"Starting installation..." 5
 
+[ $INPUT_FILE ] || {
+   echo $"Error: this script must be called by bootloader.kmdr; aborting." >&2
+   abort
+}
+
 [ -r $INPUT_FILE ] || {
    echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2
    abort
@@ -166,9 +118,6 @@ MOUNTPOINT=$INSTALL_MOUNTPOINT
    abort
 }
 
-REMAPPED_INSTALL_DEVICE=`find_remapped_device $INSTALL_DEVICE`
-echo $"Install device $INSTALL_DEVICE will be known as $REMAPPED_INSTALL_DEVICE in the installed system" | tee -a $LOG_FILE
-
 dcop_write $"Binding system dirs to new mountpoint..." 73
 mount -o bind /dev $MOUNTPOINT/dev || {
    echo $"Error: could not mount $MOUNTPOINT/dev; aborting." >&2
@@ -188,7 +137,7 @@ mount -o bind /proc $MOUNTPOINT/proc || {
 if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
 
    for k in $MOUNTPOINT/boot/vmlinuz-*; do 
-      KVER=${k/\/boot\/vmlinuz-}
+      KVER=${k/*\/boot\/vmlinuz-}
       dcop_write $"Recreating initramfs for $KVER kernel..." 82
       echo $"Recreating initramfs for $KVER kernel" | tee -a $LOG_FILE
       chroot $MOUNTPOINT mkinitrd -f /boot/initramfs-${KVER}.img ${KVER}
@@ -246,10 +195,6 @@ _EOF
    }
 
    chroot $MOUNTPOINT update-grub | tee -a $LOGFILE
-
-   [ "${INSTALL_DEVICE}" != "${REMAPPED_INSTALL_DEVICE}" ] && \
-      sed -i "s|root=/dev/${INSTALL_DEVICE:5:5}|root=/dev/${REMAPPED_INSTALL_DEVICE:5:5}|" \
-             $MOUNTPOINT/boot/grub/grub.cfg
 else
    echo $"Info: skipping bootloader installation" | tee -a $LOG_FILE
 fi

bootrecover/bootrecover.sh~

@@ -1,270 +0,0 @@
-# openmamba boot loader recovery script
-# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
-#
-# Released under the terms of the GNU GPLv3 License
-
-VERSION=0.6
-TEXTDOMAIN=bootrecover
-TEXTDOMAINDIR=/opt/kde3/share/locale/
-INSTALL_DATE=`date +%Y%m%d-%H%M`
-INPUT_FILE=~/.bootrecover.conf
-LOG_FILE=/var/log/bootrecover-$INSTALL_DATE.log
-MOUNTPOINT=/mnt/install
-KERNEL_RELEASE=`uname -r`
-
-function abort() {
-   [ "$DCOPID" ] && {
-      dcop $DCOPID KommanderIf setText progressText $"Installation aborted; press Next to see the error log."
-      dcop $DCOPID KommanderIf setText finallabel $"Installation aborted :-("
-      dcop $DCOPID KommanderIf setEnabled next true
-   }
-   exit 1
-}
-
-function finished() {
-   [ "$DCOPID" ] && {
-      dcop $DCOPID KommanderIf setText progressText $"Installation completed; press Next to continue."
-      dcop $DCOPID KommanderIf setText progressBar 100
-      dcop $DCOPID KommanderIf setText installTopLabel $"Installation completed."
-      dcop $DCOPID KommanderIf setText installInfoLabel ""
-      dcop $DCOPID KommanderIf setEnabled next true
-      dcop $DCOPID KommanderIf setEnabled ProgressGroupBox true
-   }
-   exit 1
-}
-
-function dcop_write() {
-   [ "$DCOPID" ] && {
-      dcop $DCOPID KommanderIf setText progressText "$1"
-      dcop $DCOPID KommanderIf setText progressBar $2
-   }
-}
-
-function apt_parser() {
-   while read line; do
-      [ "$DCOPID" ] && {
-         echo $line
-         dcop $DCOPID KommanderIf setText progressText2 "$line"
-      }
-   done
-}
-
-cp_parser_count=0
-date_start=`date +%s`
-
-function cp_parser() {
-   while read line; do
-      let cp_parser_count+=1
-      if [ $cp_parser_count -ge 100 ]; then
-         [ "$DCOPID" ] && {
-            CP_LINE=`echo ${line/*$MOUNTPOINT/}`
-	    MOUNT_SPACE=`du -sh $MOUNTPOINT`
-	    MOUNT_SPACE=${MOUNT_SPACE/$MOUNTPOINT/}
-	    let TIME_ELAPSED=\(`date +%s`-$date_start\)/60
-	    
-            dcop $DCOPID KommanderIf setText progressText2 $"\
-Copying: '$CP_LINE
-${MOUNT_SPACE}bytes copied
-Installation time: $TIME_ELAPSED minutes"
-         }
-	 cp_parser_count=0
-      fi
-   done
-}
-
-function find_driver_for_udi() {
-   local found_driver parent_udi
-
-   parent_udi=$1
-   while [ ! "$found_driver" -a "$parent_udi" != "/org/freedesktop/Hal/devices/computer" ]; do
-      parent_udi=`hal-get-property --udi $parent_udi --key info.parent 2>/dev/null`
-      [ "`hal-get-property --udi $parent_udi --key info.bus 2>/dev/null`" = "pci" ] &&
-         found_driver=`hal-get-property --udi $parent_udi --key info.linux.driver 2>/dev/null`
-   done
-   if [ "$found_driver" ]; then
-      echo $found_driver
-      return 0
-   else
-      return 1
-   fi
-}
-
-function find_remapped_device() {
-
-   local REMAPPED_INSTALL_DEVICE
-
-   tempfile=`tempfile 2>/dev/null`
-   mapfile=`tempfile 2>/dev/null`
-
-   # generate current volumes sorted list with driver information
-   storages=`hal-find-by-capability --capability storage`
-   for s in $storages; do
-      device=`hal-get-property --udi $s --key block.device`
-      linux_driver=`find_driver_for_udi $s`
-      [ "${device:5:2}" = "sd" ] && \
-         echo "${device:0:8} $linux_driver" >> $tempfile
-   done
-   # sort
-   cat $tempfile|sort > $mapfile
-   rm -f $tempfile
-
-   LETTERS=(a b c d e f g h i j k l m n o p q r s t u v w x y z)
-
-   CURR_DRIVE_LETTER=0
-   while read line; do
-      set -- $line
-      [ "$1" = "$INSTALL_DISK_DEVICE" ] && REMAPPED_INSTALL_DEVICE="${INSTALL_DEVICE:0:7}${LETTERS[CURR_DRIVE_LETTER]}${INSTALL_DEVICE:8:2}"
-      [ "$2" = "$INSTALL_DRIVER" ] && {
-         DEV_NAME_ORIG=(${DEV_NAME_ORIG[*]} $1)
-         DEV_NAME_DEST=(${DEV_NAME_DEST[*]} ${1:0:7}${LETTERS[CURR_DRIVE_LETTER]})
-         let CURR_DRIVE_LETTER+=1
-      }
-   done < $mapfile
-   [ "$REMAPPED_INSTALL_DEVICE" ] || REMAPPED_INSTALL_DEVICE=$INSTALL_DEVICE
-   echo $REMAPPED_INSTALL_DEVICE
-
-   rm -f $mapfile
-   rm -f $tmpfile
-}
-
-DCOPID=$2
-
-echo $"\
-openmamba boot loader recovery script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
-"
-
-dcop_write $"Starting installation..." 5
-
-[ -r $INPUT_FILE ] || {
-   echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2
-   abort
-}
-
-. $INPUT_FILE
-
-[ $INSTALL_DEVICE ] || {
-   echo $"Error: installation device is not defined in $INPUT_FILE; aborting." >&2
-   abort
-}
-
-INSTALL_DISK_DEVICE=${INSTALL_DEVICE:0:8}
-MOUNTPOINT=$INSTALL_MOUNTPOINT
-
-[ -d $MOUNTPOINT ] || {
-   echo $"Error: mount point $MOUNTPOINT does not exist or is not a directory; aborting." >&2
-   abort
-}
-
-[ -e $MOUNTPOINT/etc/openmamba-release ] || {
-   echo $"Error: file $MOUNTPOINT/etc/openmamba-release does not exist; aborting." >&2
-   abort
-}
-
-[ -e $MOUNTPOINT/usr/sbin/grub-install ] || {
-   echo $"Error: file $MOUNTPOINT/usr/sbin/grub-install missing; aborting." >&2
-   abort
-}
-
-REMAPPED_INSTALL_DEVICE=`find_remapped_device $INSTALL_DEVICE`
-echo $"Install device $INSTALL_DEVICE will be known as $REMAPPED_INSTALL_DEVICE in the installed system" | tee -a $LOG_FILE
-
-dcop_write $"Binding system dirs to new mountpoint..." 73
-mount -o bind /dev $MOUNTPOINT/dev || {
-   echo $"Error: could not mount $MOUNTPOINT/dev; aborting." >&2
-   abort
-}
-
-mount -o bind /sys $MOUNTPOINT/sys || {
-   echo $"Error: could not mount $MOUNTPOINT/sys; aborting." >&2
-   abort
-}
-
-mount -o bind /proc $MOUNTPOINT/proc || {
-   echo $"Error: could not mount $MOUNTPOINT/proc; aborting." >&2
-   abort
-}
-
-if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
-
-   for k in $MOUNTPOINT/boot/vmlinuz-*; do 
-      KVER=${k/\/boot\/vmlinuz-}
-      dcop_write $"Recreating initramfs for $KVER kernel..." 82
-      echo $"Recreating initramfs for $KVER kernel" | tee -a $LOG_FILE
-      chroot mkinitrd -f /boot/initramfs-${KVER}.img ${KVER}
-   done
-
-   dcop_write $"Installing bootloader on $INSTALL_BOOTLOADER_DEVICE..." 90
-   echo $"Installing grub bootloader on $INSTALL_BOOTLOADER_DEVICE" | tee -a $LOG_FILE
-
-   grub-install $INSTALL_BOOTLOADER_DEVICE --root-directory=$MOUNTPOINT --recheck --no-floppy
-
-   [ "$INSTALL_BOOTLOADER_DEVICE_SETBOOTABLE" = "1" -a \
-     "${INSTALL_BOOTLOADER_DEVICE:8:2}" ] && {
-      parted ${INSTALL_BOOTLOADER_DEVICE:0:8} \
-             set ${INSTALL_BOOTLOADER_DEVICE:8:2} boot on || \
-         echo $"Warning: there was an error setting bootloader partition as bootable." >&2
-   }
-
-   [ "$INSTALL_BOOTLOADER_CHAINLOAD" ] && {
-      # configure boot chainloader for e.g. windows
-      GRUB_OTHER_TITLES=()
-      for i in ${INSTALL_BOOTLOADER_CHAINLOAD[*]}; do
-         # FIXME: missing conversion from device to grub (hdx,y) form
-	 unset ID_FS_UUID
-	 eval `blkid $i -o udev`
-         if [ "$ID_FS_UUID" ]; then
-	    if [ "$ID_FS_TYPE" = "ntfs" ]; then
-	       [ "$ID_FS_LABEL" ] &&
-	          ID_FS_LABEL="Windows ($ID_FS_LABEL)" || ID_FS_LABEL="Windows"
-	    elif [ "${ID_FS_TYPE:0:3}" = "fat" ]; then
-	       [ "$ID_FS_LABEL" ] &&
-	          ID_FS_LABEL="Win/DOS ($ID_FS_LABEL)" || ID_FS_LABEL="Windows/DOS"
-	    else
-	       [ "$ID_FS_LABEL" ] &&
-	          ID_FS_LABEL="Other OS ($ID_FS_LABEL)" || ID_FS_LABEL="Other OS"	    
-	    fi
-	    [ "$ID_FS_LABEL" ] || ID_FS_LABEL="W"
-	    GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]} /dev/disk/by-uuid/$ID_FS_UUID)
-	    GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"$ID_FS_LABEL\"")
-	 else
-	    GRUB_OTHER_DEV=$i
-            for o in `seq 1 ${#DEV_NAME_ORIG[*]}`; do
-               [ "${DEV_NAME_ORIG[o-1]}" = "${i:5:3}" ] && {
-	           GRUB_OTHER_DEV=${DEV_NAME_DEST[o-1]}${i:8:2}
-	   	   break
-               }
-	    done
-	    GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]} $GRUB_OTHER_DEV)
-	    GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"Windows on $GRUB_OTHER_DEV\"")
-	 fi
-      done
-      cat >> $MOUNTPOINT/etc/sysconfig/grub << _EOF
-GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]})
-GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]})
-_EOF
-   }
-
-   chroot $MOUNTPOINT update-grub | tee -a $LOGFILE
-
-   [ "${INSTALL_DEVICE}" != "${REMAPPED_INSTALL_DEVICE}" ] && \
-      sed -i "s|root=/dev/${INSTALL_DEVICE:5:5}|root=/dev/${REMAPPED_INSTALL_DEVICE:5:5}|" \
-             $MOUNTPOINT/boot/grub/grub.cfg
-else
-   echo $"Info: skipping bootloader installation" | tee -a $LOG_FILE
-fi
-
-## MBR backup
-#echo "Installing MBR record on $INSTALL_DISK_DEVICE" | tee -a $LOG_FILE
-#dd if=$INSTALL_DISK_DEVICE of=$MOUNTPOINT/boot/mbr-backup bs=1 count=512
-#install-mbr $INSTALL_DISK_DEVICE
-
-umount $MOUNTPOINT/dev
-umount $MOUNTPOINT/sys
-umount $MOUNTPOINT/proc
-umount $MOUNTPOINT
-finished
-
-echo $"Installation done. You can now reboot to start the freshly installed system." | tee -a $LOG_FILE
-
-exit 0

bootrecover/openmamba-bootrecover.desktop

@@ -8,7 +8,4 @@ Exec=kmdr-executor /usr/share/openmamba/bootrecover/bootrecover.kmdr
 Icon=bootrecover
 Terminal=0
 Type=Application
-Categories=X-openmamba
-X-KDE-RootOnly=true
-X-KDE-SubstituteUID=true
-X-KDE-Username=root
+Categories=X-openmamba;

bootrecover/po/es.po

@@ -44,9 +44,9 @@ msgstr ""
 
 #: _from_rc.cc:12
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
-msgstr "Copyright (c) 2007-2010 by Silvan Calarco\n"
+msgstr "Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Expedido según los terminos de la licencia GNU GPL v3"
 
 #: _from_rc.cc:9

bootrecover/po/it.po

@@ -44,9 +44,9 @@ msgstr ""
 
 #: _from_rc.cc:12
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
-msgstr "Copyright (c) 2007-2010 by Silvan Calarco\n"
+msgstr "Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Rilasciato secondo i termini della licenza GNU GPL v3"
 
 #: _from_rc.cc:9

etc/polkit-1/localauthority/10-vendor.d/60-desktop-policy.pkla

@@ -12,3 +12,24 @@ Action=org.freedesktop.packagekit.*
 ResultAny=yes
 ResultInactive=no
 ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=org.kde.ufw.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=gufw.daemon.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes

etc/prelink.conf.d/skype.conf

@@ -0,0 +1 @@
+-b /usr/bin/skype

mambabase/mambabase-autostart.desktop

@@ -7,7 +7,7 @@ Exec=kmdr-executor /usr/share/openmamba/mambabase/mambabase.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root

mambabase/mambabase.desktop

@@ -7,7 +7,7 @@ Exec=kmdr-executor /usr/share/openmamba/mambabase/mambabase.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root

mambabase/mambabase.kmdr

@@ -229,7 +229,7 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>Copyright (c) 2007-2010 by mambaSoft di Silvan Calarco
+                    <string>Copyright (c) 2007-2011 by mambaSoft di Silvan Calarco
 Released under the terms of the GNU GPL v3 license</string>
                 </property>
                 <property name="textFormat">
@@ -277,53 +277,6 @@ Released under the terms of the GNU GPL v3 license</string>
             <property name="title">
                 <string></string>
             </property>
-            <widget class="ExecButton">
-                <property name="name">
-                    <cstring>checkButton</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>290</x>
-                        <y>190</y>
-                        <width>130</width>
-                        <height>30</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>C&amp;heck again</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>errorlabel</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>110</y>
-                        <width>550</width>
-                        <height>70</height>
-                    </rect>
-                </property>
-                <property name="font">
-                    <font>
-                    </font>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-                <property name="textFormat">
-                    <enum>AutoText</enum>
-                </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignBottom</set>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>Label7</cstring>
@@ -351,29 +304,6 @@ Released under the terms of the GNU GPL v3 license</string>
                     <set>WordBreak|AlignTop</set>
                 </property>
             </widget>
-            <widget class="ExecButton">
-                <property name="name">
-                    <cstring>ConfigureButton</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>150</x>
-                        <y>190</y>
-                        <width>130</width>
-                        <height>30</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Conf&amp;igure</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string>@exec("wicd-client -n")
-@checknetwork.execute()
-</string>
-                    </stringlist>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>label</cstring>
@@ -400,6 +330,53 @@ Released under the terms of the GNU GPL v3 license</string>
                     <set>WordBreak|AlignBottom</set>
                 </property>
             </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>errorlabel</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>110</y>
+                        <width>550</width>
+                        <height>70</height>
+                    </rect>
+                </property>
+                <property name="font">
+                    <font>
+                    </font>
+                </property>
+                <property name="text">
+                    <string></string>
+                </property>
+                <property name="textFormat">
+                    <enum>AutoText</enum>
+                </property>
+                <property name="alignment">
+                    <set>WordBreak|AlignBottom</set>
+                </property>
+            </widget>
+            <widget class="ExecButton">
+                <property name="name">
+                    <cstring>checkButton</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>220</x>
+                        <y>190</y>
+                        <width>130</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>C&amp;heck again</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
         </widget>
         <widget class="ScriptObject">
             <property name="name">
@@ -424,7 +401,6 @@ dcop @dcopid KommanderIf setChecked BackBox false
 RET=$?
 if [ $RET -eq 0 ]; then
    dcop @dcopid KommanderIf setVisible checkButton false
-   dcop @dcopid KommanderIf setVisible ConfigureButton false
    dcop @dcopid KommanderIf setChecked NextBox true
    dcop @dcopid KommanderIf setVisible label true
    dcop @dcopid KommanderIf setText errorlabel ""
@@ -432,7 +408,6 @@ else
    dcop @dcopid KommanderIf setChecked NextBox false
    dcop @dcopid KommanderIf setText errorlabel "&lt;font color=red&gt;@i18n("Error: could not contact repository host (www.openmamba.org, ret=$RET).")&lt;/font&gt;&lt;br&gt;@i18n("Please check your network configuration and press the button below to try again.")"
    dcop @dcopid KommanderIf setVisible checkButton true
-   dcop @dcopid KommanderIf setVisible ConfigureButton true
    dcop @dcopid KommanderIf setVisible label false
 fi
 </string>

mambabase/mambabase.sh

@@ -1,5 +1,5 @@
 # openmamba post installation script
-# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPLv3 License
 
@@ -50,7 +50,7 @@ DCOPID=$2
 
 echo $"\
 openmamba installation script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 "
 
 [ "$DCOPID" ] && dcop $DCOPID KommanderIf setChecked NextBox false
@@ -92,17 +92,15 @@ if [ "$INSTALL_BASE" = "1" ]; then
    dcop_write $"Removing packages that are no longer needed..." 10
    rpm -q msysklogd >/dev/null && apt_get_parsed remove -y msysklogd
 
-   # first time: remove mamba from user autostart
-   [ -e /home/$USER/.kde/Autostart/mambabase.desktop ] && {
-      rm -f /home/$USER/.kde/Autostart/mambabase.desktop
-      [ -e /home/$USER/.kde/share/config/ktiprc ] && \
-         rm -f /home/$USER/.kde/share/config/ktiprc
-   }
-   [ -e /home/$USER/.kde4/Autostart/mambabase.desktop ] && \
-      rm -f /home/$USER/.kde4/Autostart/mambabase.desktop
-
    dcop_write $"Installing/updating openmamba base packages..." 15
    rpm -q --whatprovides $BASE_PKGS >/dev/null || apt_get_parsed install -y $BASE_PKGS
+
+   # first time: remove mambabase from autostart
+   [ -e /home/$USER/.kde4/Autostart/mambabase.desktop ] && \
+      rm -f /home/$USER/.kde4/Autostart/mambabase.desktop
+   # ugly workaround: don't have permissions to rm file in /etc/xdg/autostart
+   [ -e /etc/xdg/autostart/mambabase.desktop ] && \
+      > /etc/xdg/autostart/mambabase.desktop
 fi
 
 if [ "$INSTALL_UPDATE" = "1" ]; then
@@ -168,7 +166,7 @@ fi
 if [ "$INSTALL_FLASH" = "1" ]; then
    echo $"Installing flash plugin"
    dcop_write $"Installing Flash plugin..." 10
-   konsole-nofork --background-mode -e /usr/bin/openmamba-netsrpms flashplugin
+   /usr/bin/openmamba-netsrpms flashplugin
    echo $"Executing nspluginscan"
    nspluginscan
    rpm -q gnash && {
@@ -180,18 +178,18 @@ fi
 if [ "$INSTALL_CODECS" = "1" ]; then
    echo $"Installing win32 codecs"
    dcop_write $"Installing Win32 codecs..." 10
-   konsole-nofork --background-mode -e /usr/bin/openmamba-netsrpms win32codecs
+   /usr/bin/openmamba-netsrpms win32codecs
 fi
 
 if [ "$INSTALL_MSTTCF" = "1" ]; then
    dcop_write $"Installing MS TrueType core fonts..." 10
-   konsole-nofork --background-mode -e /usr/bin/openmamba-netsrpms msttcorefonts
+   /usr/bin/openmamba-netsrpms msttcorefonts
 fi
 
 if [ "$INSTALL_SKYPE" = "1" ]; then
    rpm -q libqt4 >/dev/null || apt_get_parsed install -y libqt4
    dcop_write $"Installing Skype software..." 10
-   konsole-nofork --background-mode -e /usr/bin/openmamba-netsrpms skype
+   /usr/bin/openmamba-netsrpms skype
 fi
 
 if [ "$INSTALL_JDK" = "1" ]; then

mambabase/po/es.po

@@ -38,10 +38,10 @@ msgstr ""
 
 #: _from_rc.cc:9
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Expedido según los terminos de la licencia GNU GPL versione 3"
 
 #: _from_rc.cc:10
@@ -102,7 +102,7 @@ msgstr ""
 
 #: _from_rc.cc:17
 msgid "openmamba installation/updates"
-msgstr "instalación/actualización de openmamba"
+msgstr "Instalación/actualización de openmamba"
 
 #: _from_rc.cc:18
 msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)"
@@ -240,10 +240,10 @@ msgstr "           operación."
 #: mambabase.sh:49
 msgid ""
 "openmamba installation script - version $VERSION\n"
-"Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 msgstr ""
 "Script de instalación de openmamba - versión $VERSION\n"
-"Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 #: mambabase.sh:55
 msgid "Starting installation..."
 msgstr "Inicio de la instalación..."

mambabase/po/it.po

@@ -38,10 +38,10 @@ msgstr ""
 
 #: _from_rc.cc:9
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Rilasciato secondo i termini della licenza GNU GPL versione 3"
 
 #: _from_rc.cc:10
@@ -102,7 +102,7 @@ msgstr ""
 
 #: _from_rc.cc:17
 msgid "openmamba installation/updates"
-msgstr "installazioni/aggiornamenti di openmamba"
+msgstr "Installazioni/aggiornamenti di openmamba"
 
 #: _from_rc.cc:18
 msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)"

mambareport/mambareport.desktop

@@ -7,7 +7,7 @@ Exec=kmdr-executor /usr/share/openmamba/mambareport/mambareport.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root

mambareport/openmamba-makereport

@@ -2,10 +2,10 @@
 #
 # openmamba system report generation tool
 #
-# Copyrgiht (c) 2008-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2008-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 
-VERSION=0.7
+VERSION=20110807
 TEMPFILE=`tempfile`
 
 . ${ROOT}/etc/sysconfig/machine
@@ -50,7 +50,7 @@ function catfile() {
 
    FILENAME=$1
    FILEDESC=$2
-   
+
    for c in $FILENAME; do 
       cat >> $TEMPFILE << _EOF
 
@@ -68,25 +68,16 @@ function tailfile() {
 
    FILENAME=$1
    FILEDESC=$2
-   
-   for c in $1; do 
+
+   for c in $1; do
       cat >> $TEMPFILE << _EOF
 
 ****************************************************************
-* File '$c' (first lines): $FILEDESC
+* File '$c' (last 200 lines): $FILEDESC
 ****************************************************************
 _EOF
 
-      head -n 100 ${ROOT}/$c >> $TEMPFILE
-
-      cat >> $TEMPFILE << _EOF
-      
-****************************************************************
-* File '$c' (last lines): $FILEDESC
-****************************************************************
-_EOF
-
-      tail -n 100 ${ROOT}/$c >> $TEMPFILE
+      tail -n 200 ${ROOT}/$c >> $TEMPFILE
    done
 
 }
@@ -138,7 +129,7 @@ _EOF
 }
 
 echo "openmamba report generation tool $VERSION"
-echo "Copyright (c) 2008-2010 by Silvan Calarco"
+echo "Copyright (c) 2008-2011 by Silvan Calarco"
 echo
 
 [ $UID = 0 ] || {
@@ -169,10 +160,12 @@ catfile /etc/openmamba-release "release information"
 catfile /etc/sysconfig/machine "machine information from BIOS"
 catfile /proc/cpuinfo "processor(s) information"
 catfile /proc/meminfo "System memory information"
-catcommand /usr/sbin/lspci "PCI hardware information (short)"
+catcommand "/usr/sbin/lspci -nn" "PCI hardware information (short)"
 catcommand /usr/sbin/lsusb "USB hardware information"
 catcommand /sbin/lsmod "Loadel kernel modules"
 catcommand "rpm -qa|grep kernel-mamba" "Installed kernel packages"
+catcommand "ls -l /etc/alternatives" "System alternatives"
+tailfile /var/log/messages "system messages log"
 
 # process/memory information
 catcommand "top -b -n1" "Top running processes"
@@ -183,33 +176,45 @@ catfile /proc/cmdline "kernel startup command line"
 catcommand "ls -l /boot" "boot files"
 catfile /boot/grub/grub.cfg "GRUB configuration"
 catfile /var/log/dmesg.log "kernel startup messages"
+catcommand /bin/dmesg "last kernel messages"
 catfile "/etc/modprobe.d/*" "modules configuration"
-catinitramfs /boot/initramfs*.img "kernel initial ramdisk"
+catcommand "/usr/sbin/lsinitrd /boot/initramfs-`uname -r`.img" "running kernel initial ramdisk"
 
 # system boot problems
 catfile /var/log/initd.sysinit.start "system init logfile"
-catfile /var/log/initd.*.start "runlevel init logfile"
+catfile "/var/log/initd.3.start" "runlevel 3 init logfile"
+catfile "/var/log/initd.5.start" "runlevel 5 init logfile"
 catfile /var/log/postplug.log "system configuration tool"
 
-# graphical desktop startup
+# Suspend/Powersave
+catfile /var/log/pm-powersave.log "Current powersave logfile"
+catfile /var/log/pm-suspend.log "Last suspend logfile"
+
+# Graphical subsystem
 catfile /var/log/Xorg.0.log "Xorg startup log"
 catfile /etc/X11/xorg.conf "Xorg configuration"
+catcommand "DISPLAY=:0 /usr/bin/glxinfo" "GLX information"
 tailfile $HOME/.xsession-errors "desktop session log"
 
 # Audio
 catfile "/proc/asound/card*/codec*" "Audio driver codecs"
 catfile "/etc/asound.conf" "Alsa configuration"
-catfile "/etc/asound.state" "Alsa mixer settings"
+catfile "/var/lib/alsa/asound.state" "Alsa mixer settings"
 
 # Network
 catcommand "/sbin/ifconfig -a" "Network interfaces list"
 catcommand "/usr/sbin/iwconfig" "Wireless interfaces list"
 catcommand "/sbin/route -n" "Routing table"
-tailfile "/var/log/wicd/wicd.log" "WICD log file"
 catfile "/etc/sysconfig/network" "General network configuration"
 catfile "/etc/resolv.conf" "DNS configuration"
 
+# Disks
+for d in /dev/sd[a-z]; do
+   catcommand "smartctl -ia $d" "S.M.A.R.T. status for device $d"
+done
+
 # Installation
+catcommand "rpm -qa --last | head -n 100" "Last installed packages"
 catfile "/var/log/install-*" "Installation log"
 catfile /var/log/Xorg.5.log "Xorg installation test log"
 

mambawelcome/mambawelcome-init

@@ -27,6 +27,7 @@ INPUT_FILE=/root/.installer.conf
 #/opt/kde3/bin/dcopserver
 xinit /opt/kde3/bin/kmdr-executor /usr/share/openmamba/mambawelcome/mambawelcome.kmdr -- -br -dpi 100
 #/opt/kde3/bin/dcopserver_shutdown
+killall -9 dcopserver
 
 [ -e /root/.mambawelcome-not-completed ] && {
    rm -f /root/.mambawelcome-not-completed

mambawelcome/mambawelcome.sh

@@ -79,7 +79,7 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
    }
 
    # configure user for autologin
-   [ "$INSTALL_USER_AUTOLOGIN" = "1" ] && {
+   if [ "$INSTALL_USER_AUTOLOGIN" = "1" ]; then
       echo $"Info: enabling user autologin" | tee -a $LOG_FILE
       [ -e /opt/kde/share/config/kdm/kdmrc ] && {
          sed -i "s|AutoLoginEnable=.*|AutoLoginEnable=true|" \
@@ -87,11 +87,27 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
          sed -i "s|AutoLoginUser=.*|AutoLoginUser=$INSTALL_USER|" \
             /opt/kde/share/config/kdm/kdmrc      
       }
-   } || {
+      [ -e /etc/lxdm/lxdm.conf ] && {
+         sed -i "s|[#[:space:]]*autologin=.*|autologin=$INSTALL_USER|" \
+            /etc/lxdm/lxdm.conf
+      }
+      [ -e /etc/gdm/custom.conf ] && {
+         sed -i "s|[#[:space:]]*AutomaticLogin=.*|AutomaticLogin=$INSTALL_USER|" \
+            /etc/gdm/custom.conf
+         sed -i "s|AutomaticLoginEnable=.*|AutomaticLoginEnable=true|" \
+            /etc/gdm/custom.conf
+      }
+   else
       [ -e /opt/kde/share/config/kdm/kdmrc ] &&
          sed -i "s|AutoLoginEnable=.*|AutoLoginEnable=false|" \
             /opt/kde/share/config/kdm/kdmrc
-   }
+      [ -e /etc/lxdm/lxdm.conf ] &&
+         sed -i "s|[#[:space:]]*\(autologin.*\)|#\1|" \
+            /etc/lxdm/lxdm.conf
+      [ -e /etc/gdm/custom.conf ] &&
+         sed -i "s|AutomaticLoginEnable=.*|AutomaticLoginEnable=false|" \
+            /etc/gdm/custom.conf
+   fi
 
    # pre-create user homedir (currently just needed to put TODO txt files on
    # desktop)   
@@ -99,9 +115,10 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
    #mkdir /home/$INSTALL_USER/Desktop
    chmod 711 /home/$INSTALL_USER
    #cp /usr/share/openmamba/installer/*.txt /home/$INSTALL_USER/Desktop/
-   mkdir -p /home/$INSTALL_USER/.kde4/Autostart
-   cp /usr/share/openmamba/mambabase/mambabase-autostart.desktop /home/$INSTALL_USER/.kde4/Autostart/mambabase.desktop
-   chmod 711 /home/$INSTALL_USER/.kde4/Autostart/mambabase.desktop
+
+   cp /usr/share/openmamba/mambabase/mambabase-autostart.desktop /etc/xdg/autostart/mambabase.desktop
+   chown $INSTALL_USER /etc/xdg/autostart/mambabase.desktop
+   chmod 644 /etc/xdg/autostart/mambabase.desktop
 
    # create home kde configuration directory
    mkdir -p /home/$INSTALL_USER/.kde4/share/config
@@ -143,7 +160,7 @@ sh -c "echo $INSTALL_ROOT_PASSWORD | passwd --stdin" || {
 }
 
 # update grub device mappings and config
-/usr/sbin/grub-mkdevicemap
+/usr/sbin/grub-mkdevicemap -n
 /usr/sbin/update-grub
 
 # configure suspend (from suspend rpm post script) and recreate mkinitramfs

menu/applications/logs/dmesg-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Messaggi del kernel durante l'avvio del sistema
 Comment[fr]=Messages du noyau lors du démarrage du système
 Exec=@distrobindir@/showlog /var/log/dmesg.log "Kernel init messages" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/runlevel-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Informazioni sull'avvio dei servizi di runlevel 5
 Comment[fr]=Messages au démarrage des services du runlevel 5
 Exec=@distrobindir@/showlog /var/log/initd.5.start "Runlevel 5 init log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/runlevel0-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Informazioni riguardo all'ultimo spegnimento del sistema
 Comment[fr]=Messages du système lors du dernier arrêt
 Exec=@distrobindir@/showlog /var/log/initd.0.stop "Last shutdown log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/runlevel6-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Informazioni riguardo all'ultimo riavvio del sistema
 Comment[fr]=Messages du système lors du dernier redémarrage
 Exec=@distrobindir@/showlog /var/log/initd.6.stop "Last reboot log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/sysinit-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Messaggi di avvio del sistema openmamba
 Comment[fr]=Messages au démerrage du système openmamba
 Exec=@distrobindir@/showlog /var/log/initd.sysinit.start "System init log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/netinstall/b43-firmware.desktop.in

@@ -8,7 +8,7 @@ Comment[es]=Instala el Broadcom B43 firmware por red
 Comment[fr]=Installation du Broadcom B43 firmware depuis le réseau
 Comment[it]=Installa il firmware Broadcom B43 dalla rete
 Encoding=UTF-8
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms b43-firmware
+Exec=@bindir@/openmamba-netsrpms b43-firmware
 Icon=network-wireless
 MimeType=
 Path=

menu/applications/netinstall/flashplugin.desktop.in

@@ -8,7 +8,7 @@ Comment[es]=Instala el plugin Flash por red
 Comment[fr]=Installation du plugin Flash depuis le réseau
 Comment[it]=Installa il plugin Flash dalla rete
 Encoding=UTF-8
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms flashplugin
+Exec=@bindir@/openmamba-netsrpms flashplugin
 Icon=distromenu-flash
 MimeType=
 Path=

menu/applications/netinstall/jre.desktop.pregpl.in

@@ -9,6 +9,6 @@ Comment=Install Java Runtime Environment (JRE) from network
 Comment[es]=Instala el Java Runtime Environment (JRE) por red
 Comment[it]=Installa il Java Runtime Environment (JRE) dalla rete
 Comment[fr]=Installation du Java Runtime Environment (JRE) depuis le réseau
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms jre
+Exec=@bindir@/openmamba-netsrpms jre
 Icon=distromenu-java
 Categories=X-@distroID@-NetInstall;

menu/applications/netinstall/msttcorefonts.desktop.in

@@ -9,6 +9,6 @@ Comment=Install MS TrueType Core Fonts for the Web
 Comment[es]=Instala las fuentes MS TrueType para el Web
 Comment[it]=Installa i font MS TrueType per il Web
 Comment[fr]=Installation des polices MS TrueType pour le Web
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms msttcorefonts
+Exec=@bindir@/openmamba-netsrpms msttcorefonts
 Icon=fonts-package
 Categories=X-@distroID@-NetInstall;

menu/applications/netinstall/skype.desktop.in

@@ -8,7 +8,7 @@ Comment[es]=Instala Skype por red
 Comment[fr]=Installation du Skype depuis le réseau
 Comment[it]=Installa Skype dalla rete
 Encoding=UTF-8
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms skype
+Exec=@bindir@/openmamba-netsrpms skype
 Icon=distromenu-skype
 MimeType=
 Path=

menu/applications/netinstall/virtualbox-extension-pack.desktop.in

@@ -0,0 +1,19 @@
+[Desktop Entry]
+Name=Install VirtualBox Extension Pack
+Name[es]=Instala el VirtualBox Extension Pack
+Name[fr]=Installation du VirtualBox Extension Pack
+Name[it]=Installa il VirtualBox Extension Pack
+Comment=Install VirtualBox Extension Pack from network
+Comment[es]=Instala el VirtualBox Extension Pack por red
+Comment[fr]=Installation du VirtualBox Extension Pack depuis le réseau
+Comment[it]=Installa il VirtualBox Extension Pack dalla rete
+Encoding=UTF-8
+Exec=@bindir@/openmamba-netsrpms virtualbox-extension-pack
+Icon=VBox
+MimeType=
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+Categories=X-@distroID@-NetInstall;

menu/applications/netinstall/win32codecs.desktop.in

@@ -9,6 +9,6 @@ Comment=Install the multimedia win32 codecs
 Comment[es]=Instala y pon al día los Win32 codecs multimediales
 Comment[it]=Installa ed aggiorna i codec multimediali Win32
 Comment[fr]=Installation et mise à jour des codecs multimédias Win32
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms win32codecs
+Exec=@bindir@/openmamba-netsrpms win32codecs
 Icon=applications-multimedia
 Categories=X-@distroID@-NetInstall;

openmamba-update/openmamba-netsrpms

@@ -32,19 +32,16 @@ fi
 function check_if_already_installed() {
    rpm -q $1 &>/dev/null
    if [ $? -eq 0 ]; then
-      kdialog \
-         --caption "$pckname" \
-         --msgbox "$pckname: "$"already installed."
+      notify-send -i $icon "$pckname" "$pckname: "$"already installed."
    else
-      kdialog \
-         --caption "$pckname" \
-         --sorry $"There was an error installing"" $pckname!"
+      notify-send -i $icon "$pckname" $"There was an error installing"" $pckname!"
    fi
 }
 
-
 for pckname in $PACKAGES; do
 
+   icon=`grep Icon= /usr/share/applications/openmamba-$pckname.desktop | sed "s|Icon=||"`
+
    SRPM_NAME=`\
       find $DISTRO_SRPMS_DIR \
          -regex ".*/${pckname//+/\\+}-[^-]*-[^-]*" -printf "%f " 2>/dev/null`
@@ -104,16 +101,11 @@ for pckname in $PACKAGES; do
         cpio --quiet --extract --make-directories < $tmpfile ) 2>/dev/null
 
       if [ -f $tmpdir/LICENSE ]; then
-         kdialog \
-            --caption "LICENSE" \
-            --textbox $tmpdir/LICENSE 600 400
+         license-dialog $tmpdir/LICENSE
          [ $? -ne 0 ] && exit 1
       fi
 
-      kdialog \
-        --title "$pckname" \
-        --passivepopup \
-        $"$pckname installation in progress..."
+      notify-send -i $icon "$pckname" $"$pckname installation in progress..."
 
       # build rpm
       echo "$me: "$"rebuilding package \`$SRPM_PATH'..."
@@ -135,14 +127,9 @@ for pckname in $PACKAGES; do
 
       rpm -q $pckname 2>/dev/null
       if [ $? -eq 0 ]; then
-         kdialog \
-            --title "$pckname" \
-            --passivepopup \
-            $"Installation of $pckname successfully completed."
+         notify-send -i $icon "$pckname" $"Installation of $pckname successfully completed."
       else
-         kdialog \
-            --caption "$pckname" \
-            --sorry $"There was an error installing $pckname!"
+         notify-send -i $icon "$pckname" $"There was an error installing $pckname!"
       fi
       rm -rf $tmpdir $tmpfile
 

usbinstall/usbinstall.desktop

@@ -7,7 +7,7 @@ Exec=/usr/share/openmamba/usbinstall/usbinstall.sh
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 X-KDE-RootOnly=true
 X-KDE-SubstituteUID=true
 X-KDE-Username=root

usbinstall/usbinstall.sh

@@ -17,8 +17,12 @@ filecpio=""~/openmamba-bootusb-it-snapshot-"$version".i586.cpio.gz""
 
 TEXTDOMAIN=usbinstall
 TEXTDOMAINDIR=/usr/share/locale/
-# formattazione della chiavetta e installazione dei file necessari al boot di openmamba
 
+function get_udisks_key() {
+   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
+}
+
+# formattazione della chiavetta e installazione dei file necessari al boot di openmamba
 installa(){
 conferma=0
 chiave=$c
@@ -97,21 +101,24 @@ exit 0
 }
 
 scansione() {
-#scansione di hal alla ricerca di tutte le periferiche di archiviazione usb
+#ricerca di tutte le periferiche di archiviazione usb
+devices=`udisks --enumerate-device-files | grep -v /dev/disk | sort -n`
 c=0
-for udi in $(/usr/bin/hal-find-by-capability --capability storage)
-do
-    if [[ $(hal-get-property --udi $udi --key storage.removable) = "true" &&
-          $(hal-get-property --udi $udi --key storage.drive_type) = "disk" ]]; then
-	c=$((c+1))
-        device[$c]=$(hal-get-property --udi $udi --key block.device)
-        vendor[$c]=$(hal-get-property --udi $udi --key storage.vendor)
-        model[$c]=$(hal-get-property --udi $udi --key storage.model)
-	parent_udi=$(hal-find-by-property --key block.storage_device --string $udi)
-#        mount[$c]=$(hal-get-property --udi $parent_udi --key volume.mount_point)
-#        label[$c]=$(hal-get-property --udi $parent_udi --key volume.label)
-        media_size[$c]=$(hal-get-property --udi $udi --key storage.removable.media_size)
-        size[$c]=$(( ${media_size[$c]}/(1000*1000*1000)))
+
+for dev in $devices; do
+   native_path=`get_udisks_key $dev native-path`
+   vend=`get_udisks_key $dev vendor`
+   prod=`get_udisks_key $dev model`
+   [ -e $native_path/partition ] && continue
+   is_system_internal=`get_udisks_key $dev "system internal"`
+   partition_scheme=`get_udisks_key $dev "scheme"`
+   if [ "$is_system_internal" != "1" -a "$partition_scheme" = "mbr" ]; then
+      c=$((c+1))
+      device[$c]=$dev
+      vendor[$c]=$vend
+      model[$c]=$prod
+      media_size[$c]=`get_udisks_key $dev size`
+      size[$c]=$((${media_size[$c]}/(1000*1000*1000)))
     fi
 done
 if [ $c -eq 0 ]; then

xramdr/xramdr.desktop

@@ -6,7 +6,7 @@ Exec=kmdr-executor /usr/share/openmamba/xramdr/xramdr.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root