flashplugin: update to 11.1.102.62

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

Makefile

@@ -1,14 +1,16 @@
 # 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
 include SRPMSVERSIONS
 
 PACKAGE = desktop-base-openmamba
-
 DISTROID = openmamba
 
+WITHKDE3 := 1
+WITHKDE3TOOLS := 1
+
 RPM_VENDOR = openmamba
 RPM_DISTRIBUTION = openmamba
 RPM_DISTROEXT = mamba
@@ -54,8 +56,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
@@ -161,15 +161,20 @@ install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(distrobindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kde4bindir)
+ifeq ($(WITHKDE3),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeautostartdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdewallpapersdir)
+endif
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
 	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
+	cp -r etc/xprofile.d $(DESTDIR)$(sysconfdir)/
+	chmod 755 $(DESTDIR)$(sysconfdir)/xprofile.d/*.sh
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
 	cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
+ifeq ($(WITHKDE3),1)
 	cp -r kde/apps $(DESTDIR)$(kdedatadir)
 	$(INSTALL_DATA) kde/autostart/kmix.desktop $(DESTDIR)$(kdeautostartdir)/kmix.desktop
 	$(INSTALL_DATA) kde/config/*rc $(DESTDIR)$(kdeconfigdir)/
@@ -177,6 +182,7 @@ install-kde-distro-addons: dist-update
 	$(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kdeconfigdir)/kdeglobals
 	$(INSTALL_DATA) kde/wallpapers/$(WALLPAPER).desktop $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir)
+endif
 	$(INSTALL_DATA) kde/wallpapers/{$(COMPIZ_WALLPAPERS)} $(DESTDIR)$(mambaimagesdir)
 #	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
 
@@ -214,35 +220,48 @@ install-icons:
 	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
 	   $(INSTALL_DIR) $(DESTDIR)$(iconsdir)/$$i/apps/; \
 	   $(INSTALL_DATA) mambabase/mamba-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mamba.png; \
+	done
+ifeq ($(WITHKDE3TOOLS),1)
+	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
 	   $(INSTALL_DATA) mambawelcome/mambawelcome-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mambawelcome.png; \
-#	   $(INSTALL_DATA) xramdr/xramdr-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/xramdr.png; \
 	   $(INSTALL_DATA) bootrecover/bootrecover-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/bootrecover.png; \
 	done
+endif
+#	   $(INSTALL_DATA) xramdr/xramdr-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/xramdr.png \
 
 install-mambabase:
 	@$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir)
-	$(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_DATA) mambabase/mambabase.db $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_SCRIPT) mambabase/mambabase.sh $(DESTDIR)$(mambabasedatadir)
+ifeq ($(WITHKDE3TOOLS),1)
+	$(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_DATA) mambabase/mambabase.desktop $(DESTDIR)$(xdg_appsdir)
 	$(INSTALL_DATA) mambabase/mambabase-autostart.desktop $(DESTDIR)$(mambabasedatadir)
+endif
 
 install-mambareport:
+	$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
+ifeq ($(WITHKDE3TOOLS),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambareportdatadir)
 	$(INSTALL_SCRIPT) mambareport/mambareport.kmdr $(DESTDIR)$(mambareportdatadir)
-	$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
 	$(INSTALL_DATA) mambareport/mambareport.desktop $(DESTDIR)$(xdg_appsdir)
+endif
 
 install-mambawelcome:
+ifeq ($(WITHKDE3TOOLS),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambawelcomedatadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/rc.d/{init.d,rc5.d}
+	@$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome.kmdr $(DESTDIR)$(mambawelcomedatadir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome.sh $(DESTDIR)$(mambawelcomedatadir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome-init $(DESTDIR)$(sysconfdir)/rc.d/init.d/mambawelcome
 	$(INSTALL_DATA) gpl.html $(DESTDIR)$(mambawelcomedatadir)/gpl.html
 	$(INSTALL_DATA) gpl-it.html $(DESTDIR)$(mambawelcomedatadir)/gpl-it.html
 	$(INSTALL_DATA) gpl-es.html $(DESTDIR)$(mambawelcomedatadir)/gpl-es.html
+	$(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kdeconfigdir)/kcmfonts
+	$(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kdeconfigdir)/kdeglobals
 	ln -s ../init.d/mambawelcome $(DESTDIR)$(sysconfdir)/rc.d/rc5.d/S99mambawelcome
+endif
 
 install-xramdr:
 	@$(INSTALL_DIR) $(DESTDIR)$(xramdrdatadir)
@@ -251,15 +270,11 @@ install-xramdr:
 
 install-bootrecover:
 	@$(INSTALL_DIR) $(DESTDIR)$(bootrecoverdatadir)
-	$(INSTALL_SCRIPT) bootrecover/bootrecover.kmdr $(DESTDIR)$(bootrecoverdatadir)
 	$(INSTALL_SCRIPT) bootrecover/bootrecover.sh $(DESTDIR)$(bootrecoverdatadir)
+ifeq ($(WITHKDE3TOOLS),1)
+	$(INSTALL_SCRIPT) bootrecover/bootrecover.kmdr $(DESTDIR)$(bootrecoverdatadir)
 	$(INSTALL_DATA) bootrecover/openmamba-bootrecover.desktop $(DESTDIR)$(xdg_appsdir)
-
+endif
-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)
@@ -275,15 +290,14 @@ install: $(pck_infiles:.in=) \
 	install-kde-distro-addons \
 	install-distromenu \
 	install-srpms \
+	install-usbinstall \
+	install-openmamba-update \
 	install-mambabase \
 	install-mambawelcome \
 	install-mambareport \
-	install-usbinstall \
-	install-openmamba-update \
 	install-bootrecover \
 	install-locales \
-	install-icons \
+	install-icons
-	install-apt-extras
 
 dist: clean
 	@git log > ChangeLog.git

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/skype/skype.spec.in

@@ -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 xf ${SKYPE_ARCHIVE} --strip-components=1
-   tar xjf ${SKYPE_ARCHIVE} --strip-components=1
-else
-   tar xzf ${SKYPE_ARCHIVE} --strip-components=1
-fi
 
 %build -q
 

SRPMS/win32codecs/win32codecs.spec.in

@@ -82,7 +82,7 @@ rm -f $tmpfile
 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,4 +1,4 @@
-FLASHPLUGIN_VERSION=10.3.183.7
+FLASHPLUGIN_VERSION=11.1.102.62
 WIN32CODECS_VERSION=20110131
 SKYPE_VERSION=2.2.0.35
 VIRTUALBOX_EXTENSION_PACK_VERSION=4.1.2.73507

VERSION

@@ -1 +1 @@
-VERSION = 2.2.28
+VERSION = 2.3.3

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
+for device in $devices; do
-   device=`hal-get-property --udi $udi --key block.device`
+   native_path=`get_udisks_key $device native-path`
-   [ "${device:5:5}" = "$installdevice" ] &amp;&amp; continue
+   [ -e $native_path/partition ] || continue
-   parent_udi=`hal-get-property --udi $udi --key block.storage_device`
+   is_system_internal=`get_udisks_key $device "system internal"`
-   hotpluggable=`hal-get-property --udi $parent_udi --key storage.hotpluggable` || hotpluggable="false"
+   volsize=`get_udisks_key $device size`
-   blocksize=`hal-get-property --udi $udi --key volume.block_size`
+   volsize=`expr $volsize / 1024 / 1024`
-   numblocks=`hal-get-property --udi $udi --key volume.num_blocks`
-   volsize=`expr $blocksize \* $numblocks / 1024 / 1024`
    [ $volsize = 0 ] &amp;&amp; continue
-   volname=`hal-get-property --udi $udi --key volume.label`
+   volname=`get_udisks_key $device label`
-   mount_point=`hal-get-property --udi $udi --key volume.mount_point`
    [ "$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
+      case "$fstype" in
-         0x82) ;;
+         swap|iso9660|unformatted) ;;
-         0x83) ;;
+         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() {
+export PATH=$PATH:/sbin:/usr/sbin:/opt/kde3/bin
-   local found_driver parent_udi
 
-   parent_udi=$1
+INPUT_FILE=$1
-   while [ ! "$found_driver" -a "$parent_udi" != "/org/freedesktop/Hal/devices/computer" ]; do
+[ "$2" -a "$3" ] && DCOPID="--user $3 $2"
-      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>
+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
@@ -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/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
+Categories=X-openmamba;
-X-KDE-RootOnly=true
-X-KDE-SubstituteUID=true
-X-KDE-Username=root

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.conf.d/60-desktop-policy.conf

@@ -1,10 +0,0 @@
-# Configuration file for the PolicyKit Local Authority.
-#
-# DO NOT EDIT THIS FILE, it will be overwritten on update.
-#
-# See the pklocalauthority(8) man page for more information
-# about configuring the Local Authority.
-#
-
-[Configuration]
-AdminIdentities=unix-group:sysadmin

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/xprofile.d/qt-graphicssystem.sh

@@ -0,0 +1 @@
+export QT_GRAPHICSSYSTEM=raster

kde/config/kwinrc

@@ -1,3 +1,6 @@
+[Compositing]
+DisableChecks=true
+
 [Windows]
 ElectricBorders=1
 ElectricBorderDelay=150

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/po/es.po

@@ -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, ...)"

mambabase/po/it.po

@@ -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

@@ -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
+      tail -n 200 ${ROOT}/$c >> $TEMPFILE
-
-      cat >> $TEMPFILE << _EOF
-      
-****************************************************************
-* File '$c' (last lines): $FILEDESC
-****************************************************************
-_EOF
-
-      tail -n 100 ${ROOT}/$c >> $TEMPFILE
    done
 
 }
@@ -169,7 +160,7 @@ 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 -nn "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"
@@ -185,14 +176,20 @@ 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"
 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"
 
+# 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"
@@ -202,7 +199,7 @@ 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"
@@ -211,7 +208,13 @@ catcommand "/sbin/route -n" "Routing table"
 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

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;

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
+for dev in $devices; do
-    if [[ $(hal-get-property --udi $udi --key storage.removable) = "true" &&
+   native_path=`get_udisks_key $dev native-path`
-          $(hal-get-property --udi $udi --key storage.drive_type) = "disk" ]]; then
+   vend=`get_udisks_key $dev vendor`
-	c=$((c+1))
+   prod=`get_udisks_key $dev model`
-        device[$c]=$(hal-get-property --udi $udi --key block.device)
+   [ -e $native_path/partition ] && continue
-        vendor[$c]=$(hal-get-property --udi $udi --key storage.vendor)
+   is_system_internal=`get_udisks_key $dev "system internal"`
-        model[$c]=$(hal-get-property --udi $udi --key storage.model)
+   partition_scheme=`get_udisks_key $dev "scheme"`
-	parent_udi=$(hal-find-by-property --key block.storage_device --string $udi)
+   if [ "$is_system_internal" != "1" -a "$partition_scheme" = "mbr" ]; then
-#        mount[$c]=$(hal-get-property --udi $parent_udi --key volume.mount_point)
+      c=$((c+1))
-#        label[$c]=$(hal-get-property --udi $parent_udi --key volume.label)
+      device[$c]=$dev
-        media_size[$c]=$(hal-get-property --udi $udi --key storage.removable.media_size)
+      vendor[$c]=$vend
-        size[$c]=$(( ${media_size[$c]}/(1000*1000*1000)))
+      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