Release 2.3.25

VirtualBox-extension-pack: update to 4.2.16

Conflicts:
	SRPMSVERSIONS

Makefile

@@ -70,7 +70,6 @@ xdg_appsdir = ${datadir}/applications
 xdg_directorydir = ${datadir}/desktop-directories
 xdg_menudir = ${sysconfdir}/xdg/menus
 xdg_mergedmenudir = $(xdg_menudir)/applications-merged
-systemdsystemdir = /lib/systemd/system
 
 distrorootdir = ${datadir}/$(DISTROid)
 distrobindir = ${distrorootdir}/bin
@@ -259,18 +258,17 @@ 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_DIR) $(DESTDIR)$(systemdsystemdir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome.kmdr $(DESTDIR)$(mambawelcomedatadir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome.sh $(DESTDIR)$(mambawelcomedatadir)
-	$(INSTALL_SCRIPT) mambawelcome/mambawelcome-init $(DESTDIR)$(mambawelcomedatadir)/mambawelcome
+	$(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
-	$(INSTALL_DATA) mambawelcome/mambawelcome.service $(DESTDIR)$(systemdsystemdir)/mambawelcome.service
-	$(INSTALL_DATA) mambawelcome/mambawelcome.target $(DESTDIR)$(systemdsystemdir)/mambawelcome.target
+	ln -s ../init.d/mambawelcome $(DESTDIR)$(sysconfdir)/rc.d/rc5.d/S99mambawelcome
 endif
 
 install-xramdr:

SRPMS/spotify/spotify.spec.in

@@ -1,4 +1,4 @@
-#% define spotify_make_ver 20130831git
+%define spotify_make_ver 20130831git
 Name:          spotify
 Version:       @spotifyver@
 Release:       1mamba
@@ -9,7 +9,7 @@ Distribution:  @distribution@
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://www.spotify.com/us/download/previews/
 ## GITSOURCE https://github.com/leamas/spotify-make.git master
-Source:        https://github.com/leamas/spotify-make.git/master/spotify-make-%{version}.zip
+Source:        https://github.com/leamas/spotify-make.git/master/spotify-make-%{spotify_make_ver}.tar.bz2
 Source1:       LICENSE
 License:       Not distributable
 ## AUTOBUILDREQ-BEGIN
@@ -19,8 +19,10 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %description
 Listen to music using Spotify.
 
+%debug_package
+
 %prep
-%setup -q -n spotify-make-master
+%setup -q -n spotify-make-%{spotify_make_ver}
 
 %build
 ./configure \
@@ -37,20 +39,9 @@ install -d -m0755 %{buildroot}%{_datadir}
 mv %{buildroot}/opt/spotify/share/applications %{buildroot}%{_datadir}
 mv %{buildroot}/opt/spotify/share/icons %{buildroot}%{_datadir}
 
-install -d -m0755 %{buildroot}%{_bindir}
-ln -s /opt/spotify/bin/spotify %{buildroot}%{_bindir}/spotify
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%pre
-if [ $1 -ge 1 ]; then
-   rm -f /opt/spotify/share/spotify-client/Data/locales
-   rm -f /opt/spotify/share/spotify-client/Data/resources.zip
-   rm -f /opt/spotify/lib/spotify-client/Data
-fi
-:
-
 %post
 if [ $1 -ge 1 ]; then
    gtk-update-icon-cache --ignore-theme-index %{_datadir}/icons/hicolor
@@ -69,16 +60,15 @@ fi
 
 %files
 %defattr(-,root,root)
-%{_bindir}/spotify
-%{_datadir}/applications/spotify.desktop
-%{_datadir}/icons/hicolor/*/apps/spotify-client.png
 %dir /opt/spotify
 %dir /opt/spotify/bin
 /opt/spotify/bin/spotify
 %dir /opt/spotify/lib
 %dir /opt/spotify/lib/spotify-client
+/opt/spotify/lib/spotify-client
 /opt/spotify/lib/spotify-client/*
-%dir /opt/spotify/share
+%{_datadir}/applications/spotify.desktop
+%{_datadir}/icons/hicolor/*/apps/spotify-client.png
 %dir /opt/spotify/share/spotify-client/
 /opt/spotify/share/spotify-client/*
 %{_mandir}/man1/spotify.1.gz

SRPMS/sun-java7/sun-java7.spec.in

@@ -69,19 +69,19 @@ Sun Java Platform Runtime Environment.
 %ifarch %{ix86}
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b18/jdk-%{version}-linux-i586.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b15/jdk-%{version}-linux-i586.tar.gz
 tar xf jdk-%{version}-linux-i586.tar.gz
 %endif
 %ifarch x86_64
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b18/jdk-%{version}-linux-x64.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b15/jdk-%{version}-linux-x64.tar.gz
 tar xf jdk-%{version}-linux-x64.tar.gz
 %endif
 %ifarch arm
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b18/jdk-%{version}-linux-arm-sflt.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b15/jdk-%{version}-linux-arm-sfp.tar.gz
 tar xf jdk-%{version}-linux-arm-sfp.tar.gz
 %endif
 
@@ -534,10 +534,8 @@ fi
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/trusted.libraries
 %ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
 %ghost %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
-%dir %{_jvmdir}/%{jredir}/lib/jfr
-%{_jvmdir}/%{jredir}/lib/jfr/*
 %{_jvmdir}/%{jredir}/lib/currency.data
-#%{_jvmdir}/%{jredir}/lib/servicetag
+%{_jvmdir}/%{jredir}/lib/servicetag
 %{_jvmdir}/%{jredir}/.systemPrefs
 %{_jvmdir}/%{jredir}/lib/zi
 

SRPMSVERSIONS

@@ -1,6 +1,6 @@
-FLASHPLUGIN_VERSION=11.2.202.310
+FLASHPLUGIN_VERSION=11.2.202.297
 WIN32CODECS_VERSION=20110131
 SKYPE_VERSION=4.2.0.11
-VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.18
-SUN_JAVA7_VERSION=7u45
-SPOTIFY_VERSION=20131103
+VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
+SUN_JAVA7_VERSION=7u25
+SPOTIFY_VERSION=0.9.1.55.gbdd3b79.203

SRPMSVERSIONS.arm

@@ -1 +1 @@
-SUN_JAVA7_VERSION=7u45
+SUN_JAVA7_VERSION=7u25

VERSION

@@ -1 +1 @@
-VERSION = 2.3.99
+VERSION = 2.3.25

bootrecover/bootrecover.kmdr

@@ -457,6 +457,28 @@ This tool is also useful before the installation of a third party boot manager i
                     <string></string>
                 </stringlist>
             </property>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>Label24</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>30</y>
+                        <width>540</width>
+                        <height>40</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Please, select the openmamba system partition where you want the boot loader to be installed from.</string>
+                </property>
+                <property name="textFormat">
+                    <enum>RichText</enum>
+                </property>
+                <property name="alignment">
+                    <set>WordBreak|AlignTop</set>
+                </property>
+            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>Label3</cstring>
@@ -481,49 +503,6 @@ This tool is also useful before the installation of a third party boot manager i
                     <set>AlignVCenter|AlignLeft</set>
                 </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 class="Label">
-                <property name="name">
-                    <cstring>Label24</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>30</y>
-                        <width>540</width>
-                        <height>40</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Please, select the openmamba system partition where you want the boot loader to be installed from.</string>
-                </property>
-                <property name="textFormat">
-                    <enum>RichText</enum>
-                </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignTop</set>
-                </property>
-            </widget>
             <widget class="ListBox">
                 <property name="name">
                     <cstring>devicesbox</cstring>
@@ -545,6 +524,27 @@ This tool is also useful before the installation of a third party boot manager i
                     </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">
@@ -646,9 +646,6 @@ done
 function get_udisks_key() {
    LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
 }
-function get_udisks_key_last() {
-   LANG=C udisks --show-info $1 | grep " $2:" | tail -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))
@@ -664,18 +661,12 @@ function get_udisks_key_last() {
 
    for device in $devices; do
       native_path=`get_udisks_key $device native-path`
-      if [ -e $native_path/partition ]; then
-          partition_label=`get_udisks_key_last $device label`
-          if [ "${partition_label:0:3}" = "EFI" ]; then
-             dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "${device:5:5} (@i18n("EFI system partition"))" 0
-          fi
-      else
-         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
+      [ -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
@@ -718,44 +709,6 @@ function get_udisks_key_last() {
                 <set>AlignCenter</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>530</x>
-                    <y>0</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@BackBox.setChecked(true)
-@NextBox.setChecked(true)
-@execBegin
-mbrstring=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",1)
-mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
-mbrpart=${mbrdevice:3:2}
-if [ "$mbrpart" -a "${mbrstring/EFI}" = "${mbrstring}" ]; 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="ButtonGroup">
             <property name="name">
                 <cstring>BootloaderBox</cstring>
@@ -779,25 +732,6 @@ fi
             <property name="title">
                 <string>Bootloader configuration</string>
             </property>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>Label29_2</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>20</y>
-                        <width>531</width>
-                        <height>40</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Please select where you want to install the boot manager.</string>
-                </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignVCenter</set>
-                </property>
-            </widget>
             <widget class="QLayoutWidget">
                 <property name="name">
                     <cstring>Layout5_2</cstring>
@@ -805,7 +739,7 @@ fi
                 <property name="geometry">
                     <rect>
                         <x>10</x>
-                        <y>60</y>
+                        <y>330</y>
                         <width>530</width>
                         <height>26</height>
                     </rect>
@@ -877,6 +811,181 @@ fi
                     </widget>
                 </hbox>
             </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>Label3_2_2_2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>70</y>
+                        <width>290</width>
+                        <height>24</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Please select the boot menu options:</string>
+                </property>
+            </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>Label28</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>30</y>
+                        <width>540</width>
+                        <height>40</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Below is a list of other operating systems found on this computer, you may configure them to appear as a choice when the computer starts.</string>
+                </property>
+                <property name="alignment">
+                    <set>WordBreak|AlignTop</set>
+                </property>
+            </widget>
+            <widget class="ListBox">
+                <property name="name">
+                    <cstring>chainloadbox</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>100</y>
+                        <width>540</width>
+                        <height>170</height>
+                    </rect>
+                </property>
+                <property name="selectionMode">
+                    <enum>Multi</enum>
+                </property>
+            </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>Label29_2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>280</y>
+                        <width>531</width>
+                        <height>40</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Please select where you want to install the boot manager.</string>
+                </property>
+                <property name="alignment">
+                    <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">
+                <cstring>scanbootloader</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>10</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@BackBox.setChecked(true)
+@NextBox.setChecked(true)
+@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)
+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`
+   [ $volsize = 0 ] &amp;&amp; continue
+   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_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
+         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})"
+         ;;
+      esac
+   elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
+      case "$fstype" in
+         swap|iso9660|unformatted) ;;
+         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})"
+         ;;
+      esac
+   fi
+done
+@execEnd</string>
+                </stringlist>
+            </property>
         </widget>
     </widget>
     <widget class="QWidget">
@@ -953,25 +1062,6 @@ fi
                 </stringlist>
             </property>
         </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>ScriptObject7</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>540</x>
-                    <y>20</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>dcop @dcopid KommanderIf setText installlog "`cat ~/.bootrecover.log`"
-</string>
-                </stringlist>
-            </property>
-        </widget>
         <widget class="ScriptObject">
             <property name="name">
                 <cstring>launchinstall</cstring>
@@ -996,17 +1086,11 @@ cat &gt; $conffile &lt;&lt; _EOF
 # created by openmamba bootrecover wizard
 #
 _EOF
-
 @dcop(@dcopid, KommanderIf, enableWidget(QString,bool), back,false)
 
 installdevice=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
 mountpoint=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",1)
-mbrstring="@mbrbox.item(@mbrbox.currentItem)"
-if [ "${mbrstring/EFI}" != "${mbrstring}" ]; then
-   efidevice=/dev/@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
-else
-   mbrdevice=/dev/@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
-fi
+mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
 
 IFS=$'\n' 
 CHAINLOAD_SELECTED=(`dcop @dcopid KommanderIf selection chainloadbox`)
@@ -1018,8 +1102,7 @@ IFS=$' \t\n'
 cat &gt;&gt;$conffile &lt;&lt; _EOF
 INSTALL_DEVICE='/dev/$installdevice'
 INSTALL_MOUNTPOINT='$mountpoint'
-INSTALL_BOOTLOADER_DEVICE='$mbrdevice'
-INSTALL_BOOTLOADER_DEVICE_EFI='$efidevice'
+INSTALL_BOOTLOADER_DEVICE='/dev/$mbrdevice'
 INSTALL_BOOTLOADER_DEVICE_SETBOOTABLE=@bootableBox.checked
 INSTALL_BOOTLOADER_CHAINLOAD=($chainloaddevices)
 _EOF
@@ -1044,6 +1127,25 @@ _EOF
 @endif
 
 @BackBox.setChecked(false)
+</string>
+                </stringlist>
+            </property>
+        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>ScriptObject7</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>540</x>
+                    <y>20</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>dcop @dcopid KommanderIf setText installlog "`cat ~/.bootrecover.log`"
 </string>
                 </stringlist>
             </property>
@@ -1083,6 +1185,12 @@ _EOF
         <receiver>setBootableCheckbox</receiver>
         <slot>execute()</slot>
     </connection>
+    <connection>
+        <sender>bootableBox</sender>
+        <signal>widgetOpened()</signal>
+        <receiver>scanbootloader</receiver>
+        <slot>execute()</slot>
+    </connection>
     <connection>
         <sender>NextBox</sender>
         <signal>widgetOpened()</signal>

bootrecover/bootrecover.sh

@@ -134,8 +134,7 @@ mount -o bind /proc $MOUNTPOINT/proc || {
    abort
 }
 
-
-if [ "$INSTALL_BOOTLOADER_DEVICE" -o "$INSTALL_BOOTLOADER_DEVICE_EFI" ]; then
+if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
 
    for k in $MOUNTPOINT/boot/vmlinuz-*; do 
       KVER=${k/*\/boot\/vmlinuz-}
@@ -144,53 +143,17 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" -o "$INSTALL_BOOTLOADER_DEVICE_EFI" ]; then
       chroot $MOUNTPOINT mkinitrd -f /boot/initramfs-${KVER}.img ${KVER}
    done
 
-   if [ "$INSTALL_BOOTLOADER_DEVICE_EFI" ]; then
-      # EFI
-      dcop_write $"Installing bootloader on ""$INSTALL_BOOTLOADER_DEVICE_EFI (EFI)..." 90
-      echo $"Installing grub bootloader on ""$INSTALL_BOOTLOADER_DEVICE_EFI (EFI)" | tee -a $LOG_FILE
-      [ -e $MOUNTPOINT/boot/efi ] || mkdir -p $MOUNTPOINT/boot/efi
-      mount $INSTALL_BOOTLOADER_DEVICE_EFI $MOUNTPOINT/boot/efi
-      grub-install --root-directory=$MOUNTPOINT --efi-directory=$MOUNTPOINT/boot/efi --target=x86_64-efi \
-         --bootloader-id="openmamba Boot Manager" --recheck --no-floppy
-      umount $MOUNTPOINT/boot/efi
+   dcop_write $"Installing bootloader on $INSTALL_BOOTLOADER_DEVICE..." 90
+   echo $"Installing grub bootloader on $INSTALL_BOOTLOADER_DEVICE" | tee -a $LOG_FILE
 
-      INSTALL_BOOTLOADER_DEVICE_EFI_BYID=$INSTALL_BOOTLOADER_DEVICE_EFI
-      for f in `ls /dev/disk/by-id/*`; do 
-         if [ "$INSTALL_BOOTLOADER_DEVICE_EFI" = "`readlink -f $f`" ]; then
-            INSTALL_BOOTLOADER_DEVICE_EFI_BYID=$f
-            break
-         fi
-      done
-      sed -i "/^GRUB_INSTALL_DEVICE.*/d" $MOUNTPOINT/etc/sysconfig/grub
-      cat >> $MOUNTPOINT/etc/sysconfig/grub << _EOF
-GRUB_INSTALL_DEVICE_EFI=$INSTALL_BOOTLOADER_DEVICE_EFI_BYID
-_EOF
+   grub-install $INSTALL_BOOTLOADER_DEVICE --root-directory=$MOUNTPOINT --recheck --no-floppy
 
-   else
-      # BIOS
-      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 --target=i386-pc --recheck --no-floppy
-
-      INSTALL_BOOTLOADER_DEVICE_BYID=$INSTALL_BOOTLOADER_DEVICE
-      for f in `ls /dev/disk/by-id/*`; do 
-         if [ "$INSTALL_BOOTLOADER_DEVICE" = "`readlink -f $f`" ]; then
-            INSTALL_BOOTLOADER_DEVICE_BYID=$f
-            break
-         fi
-      done
-      sed -i "/^GRUB_INSTALL_DEVICE.*/d" $MOUNTPOINT/etc/sysconfig/grub
-      cat >> $MOUNTPOINT/etc/sysconfig/grub << _EOF
-GRUB_INSTALL_DEVICE=$INSTALL_BOOTLOADER_DEVICE_EFI_BYID
-_EOF
-
-      [ "$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
-      }
-   fi
+   [ "$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
@@ -225,7 +188,6 @@ _EOF
 	    GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"Windows on $GRUB_OTHER_DEV\"")
 	 fi
       done
-      sed -i "/^GRUB_OTHER_.*/d" $MOUNTPOINT/etc/sysconfig/grub
       cat >> $MOUNTPOINT/etc/sysconfig/grub << _EOF
 GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]})
 GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]})
@@ -245,7 +207,7 @@ fi
 umount $MOUNTPOINT/dev
 umount $MOUNTPOINT/sys
 umount $MOUNTPOINT/proc
-sync
+umount $MOUNTPOINT
 finished
 
 echo $"Installation done. You can now reboot to start the freshly installed system." | tee -a $LOG_FILE

mambawelcome/mambawelcome-init

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # mambawelcome - start mambawelcome on first time system execution
-# Copyright (c) 2007-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2009 by Silvan Calarco <silvan.calarco@mambasoft.it>
 
 if [ $UID != 0 ]; then
    echo "$0: must be superuser." >&2
@@ -29,12 +29,9 @@ xinit /opt/kde3/bin/kmdr-executor /usr/share/openmamba/mambawelcome/mambawelcome
 #/opt/kde3/bin/dcopserver_shutdown
 killall -9 dcopserver
 
-if [ -e /root/.mambawelcome-not-completed ]; then
+[ -e /root/.mambawelcome-not-completed ] && {
    rm -f /root/.mambawelcome-not-completed
-   poweroff
-else
-   systemctl disable mambawelcome.target
-   systemctl isolate graphical.target
-fi
+   halt
+}
 
 exit 0

mambawelcome/mambawelcome.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=openmamba 2nd stage installation welcome dialog
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
-
-[Service]
-ExecStart=/usr/share/openmamba/mambawelcome/mambawelcome
-Restart=always
-IgnoreSIGPIPE=no
-
-[Install]
-WantedBy=mambawelcome.target

mambawelcome/mambawelcome.sh

@@ -149,7 +149,7 @@ sh -c "echo $INSTALL_ROOT_PASSWORD | passwd --stdin" || {
 
 # set hostname and domain
 [[ "$INSTALL_HOSTNAME" ]] && {
-   hostnamectl set-hostname $INSTALL_HOSTNAME
+   hostname $INSTALL_HOSTNAME
    sed -i "s|HOSTNAME=.*|HOSTNAME=$INSTALL_HOSTNAME|" \
    /etc/sysconfig/network
 

mambawelcome/mambawelcome.target

@@ -1,17 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Mambawelcome 2nd stage install target
-Documentation=man:systemd.special(7)
-Requires=multi-user.target
-After=multi-user.target
-Conflicts=rescue.target
-AllowIsolate=yes
-
-[Install]
-Alias=default.target