Release 2.3.94

mambawelcome: systemd support
flashplugin: update to 11.2.202.291
2013-07-01 20:18:50 +02:00 · 2013-06-28 23:15:37 +02:00 · 2013-06-25 17:10:35 +02:00 · 2013-06-12 01:46:46 +02:00 · 2013-06-11 17:19:57 +02:00 · 2013-06-11 15:50:40 +02:00
16 changed files with 244 additions and 279 deletions
--- a/8
+++ b/8
@@ -68,6 +68,7 @@ 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
@@ -257,17 +258,18 @@ 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)$(sysconfdir)/rc.d/init.d/mambawelcome
+	$(INSTALL_SCRIPT) mambawelcome/mambawelcome-init $(DESTDIR)$(mambawelcomedatadir)/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
+	$(INSTALL_DATA) mambawelcome/mambawelcome.service $(DESTDIR)$(systemdsystemdir)/mambawelcome.service
+	$(INSTALL_DATA) mambawelcome/mambawelcome.target $(DESTDIR)$(systemdsystemdir)/mambawelcome.target
 endif

 install-xramdr:
--- a/SRPMS/sun-java7/sun-java7.spec.in
+++ b/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}-b02/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}-b02/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-sfp.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

--- a/8
+++ b/8
@@ -1,5 +1,5 @@
-FLASHPLUGIN_VERSION=11.2.202.280
+FLASHPLUGIN_VERSION=11.2.202.291
 WIN32CODECS_VERSION=20110131
-SKYPE_VERSION=4.1.0.20
-VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
-SUN_JAVA7_VERSION=7u17
+SKYPE_VERSION=4.2.0.11
+VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.14
+SUN_JAVA7_VERSION=7u25
--- a/SRPMSVERSIONS.arm
+++ b/SRPMSVERSIONS.arm
@@ -2,4 +2,4 @@ FLASHPLUGIN_VERSION=11.2.202.280
 WIN32CODECS_VERSION=20110131
 SKYPE_VERSION=4.1.0.20
 VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
-SUN_JAVA7_VERSION=7u10
+SUN_JAVA7_VERSION=7u25
--- a/2
+++ b/2
@@ -1 +1 @@
-VERSION = 2.3.21.1
+VERSION = 2.3.94
--- a/bootrecover/bootrecover.kmdr
+++ b/bootrecover/bootrecover.kmdr
@@ -457,28 +457,6 @@ 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>
@@ -503,27 +481,6 @@ This tool is also useful before the installation of a third party boot manager i
                    <set>AlignVCenter|AlignLeft</set>
                </property>
            </widget>
-            <widget class="ListBox">
-                <property name="name">
-                    <cstring>devicesbox</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>90</y>
-                        <width>540</width>
-                        <height>230</height>
-                    </rect>
-                </property>
-                <property name="populationText">
-                    <string></string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
            <widget class="Label">
                <property name="name">
                    <cstring>showdevice</cstring>
@@ -545,6 +502,49 @@ 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>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>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>90</y>
+                        <width>540</width>
+                        <height>230</height>
+                    </rect>
+                </property>
+                <property name="populationText">
+                    <string></string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
        </widget>
        <widget class="ScriptObject">
            <property name="name">
@@ -646,6 +646,9 @@ 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))
@@ -661,13 +664,19 @@ function get_udisks_key() {

   for device in $devices; do
      native_path=`get_udisks_key $device native-path`
-      [ -e $native_path/partition ] &amp;&amp; continue
+      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
+      fi
   done
   dcop @dcopid KommanderIf "setCurrentItem(int)" 0
@endif
@@ -709,6 +718,44 @@ function get_udisks_key() {
                <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>
@@ -732,6 +779,25 @@ function get_udisks_key() {
            <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>
@@ -739,7 +805,7 @@ function get_udisks_key() {
                <property name="geometry">
                    <rect>
                        <x>10</x>
-                        <y>330</y>
+                        <y>60</y>
                        <width>530</width>
                        <height>26</height>
                    </rect>
@@ -811,181 +877,6 @@ function get_udisks_key() {
                    </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">
@@ -1062,6 +953,25 @@ done
                </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>
@@ -1086,11 +996,17 @@ 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)
-mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
+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

 IFS=$'\n' 
 CHAINLOAD_SELECTED=(`dcop @dcopid KommanderIf selection chainloadbox`)
@@ -1102,7 +1018,8 @@ IFS=$' \t\n'
 cat &gt;&gt;$conffile &lt;&lt; _EOF
 INSTALL_DEVICE='/dev/$installdevice'
 INSTALL_MOUNTPOINT='$mountpoint'
-INSTALL_BOOTLOADER_DEVICE='/dev/$mbrdevice'
+INSTALL_BOOTLOADER_DEVICE='$mbrdevice'
+INSTALL_BOOTLOADER_DEVICE_EFI='$efidevice'
 INSTALL_BOOTLOADER_DEVICE_SETBOOTABLE=@bootableBox.checked
 INSTALL_BOOTLOADER_CHAINLOAD=($chainloaddevices)
 _EOF
@@ -1127,25 +1044,6 @@ _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>
@@ -1185,12 +1083,6 @@ _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>
--- a/bootrecover/bootrecover.sh
+++ b/bootrecover/bootrecover.sh
@@ -134,7 +134,8 @@ mount -o bind /proc $MOUNTPOINT/proc || {
   abort
 }

-if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
+
+if [ "$INSTALL_BOOTLOADER_DEVICE" -o "$INSTALL_BOOTLOADER_DEVICE_EFI" ]; then

   for k in $MOUNTPOINT/boot/vmlinuz-*; do 
      KVER=${k/*\/boot\/vmlinuz-}
@@ -143,10 +144,45 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; 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
+
+      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
+
+   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

-   grub-install $INSTALL_BOOTLOADER_DEVICE --root-directory=$MOUNTPOINT --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}" ] && {
@@ -154,6 +190,7 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
                set ${INSTALL_BOOTLOADER_DEVICE:8:2} boot on || \
            echo $"Warning: there was an error setting bootloader partition as bootable." >&2
      }
+   fi

   [ "$INSTALL_BOOTLOADER_CHAINLOAD" ] && {
      # configure boot chainloader for e.g. windows
@@ -188,6 +225,7 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
 	    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[*]})
@@ -207,7 +245,7 @@ fi
 umount $MOUNTPOINT/dev
 umount $MOUNTPOINT/sys
 umount $MOUNTPOINT/proc
-umount $MOUNTPOINT
+sync
 finished

 echo $"Installation done. You can now reboot to start the freshly installed system." | tee -a $LOG_FILE
--- a/mambawelcome/mambawelcome-init
+++ b/mambawelcome/mambawelcome-init
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # mambawelcome - start mambawelcome on first time system execution
-# Copyright (c) 2007-2009 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>

 if [ $UID != 0 ]; then
   echo "$0: must be superuser." >&2
@@ -29,9 +29,12 @@ xinit /opt/kde3/bin/kmdr-executor /usr/share/openmamba/mambawelcome/mambawelcome
 #/opt/kde3/bin/dcopserver_shutdown
 killall -9 dcopserver

-[ -e /root/.mambawelcome-not-completed ] && {
+if [ -e /root/.mambawelcome-not-completed ]; then
   rm -f /root/.mambawelcome-not-completed
-   halt
-}
+   poweroff
+else
+   systemctl disable mambawelcome.target
+   systemctl isolate graphical.target
+fi

 exit 0
--- a/mambawelcome/mambawelcome.service
+++ b/mambawelcome/mambawelcome.service
@@ -0,0 +1,12 @@
+[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
--- a/mambawelcome/mambawelcome.sh
+++ b/mambawelcome/mambawelcome.sh
@@ -72,6 +72,7 @@ dcop_write $"Configuring users and host..." 50
 echo $"Configuring users and host" | tee -a $LOG_FILE
 # configure user
 [ "$INSTALL_USER" ] && {
+   userdel -rf liveuser
   useradd $INSTALL_USER \
          -c "$INSTALL_USER_FULLNAME" \
          -G audio,filesharing,sysadmin,packager,lpadmin,video,nopermfs || {
--- a/mambawelcome/mambawelcome.target
+++ b/mambawelcome/mambawelcome.target
@@ -0,0 +1,17 @@
+#  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
--- a/menu/icons/hicolor/16x16/apps/openmamba.png
+++ b/menu/icons/hicolor/16x16/apps/openmamba.png
--- a/menu/icons/hicolor/22x22/apps/openmamba.png
+++ b/menu/icons/hicolor/22x22/apps/openmamba.png
--- a/menu/icons/hicolor/32x32/apps/openmamba.png
+++ b/menu/icons/hicolor/32x32/apps/openmamba.png
--- a/menu/icons/hicolor/48x48/apps/openmamba.png
+++ b/menu/icons/hicolor/48x48/apps/openmamba.png
--- a/menu/icons/hicolor/64x64/apps/openmamba.png
+++ b/menu/icons/hicolor/64x64/apps/openmamba.png
Author	SHA1	Message	Date
Silvan Calarco	1a528e18d1	Release 2.3.94	2013-07-01 20:18:50 +02:00
Silvan Calarco	6d6e72bc35	mambawelcome: systemd support	2013-06-28 23:15:37 +02:00
Silvan Calarco	d96f76cfb0	flashplugin: update to 11.2.202.291 sun-java7: update to 7u25 virtualbox-extension-pack: update to 4.2.14	2013-06-25 17:10:35 +02:00
Silvan Calarco	a5280e1c2c	Release 2.3.92	2013-06-12 01:46:46 +02:00
Silvan Calarco	dcdb576efe	bootrecover: support for EFI (currently only target x86_64-efi)	2013-06-11 17:19:57 +02:00
Silvan Calarco	deb176ea16	bootrecover: remove other O.S. partiton selection, rely on grub-install + os-prober for automatic configuration	2013-06-11 15:50:40 +02:00
Silvan Calarco	04f0aaaf5c	mambawelcome.sh: remove user 'liveuser' as it fails to be removed during first stage install when livecd-tools package is removed	2013-06-11 14:05:55 +02:00
Silvan Calarco	20a3059e4f	Release 2.3.91	2013-05-22 15:56:00 +02:00
Silvan Calarco	04cfbb356d	flashplugin: update to 11.2.202.285; skype: update to 4.2.0.11	2013-05-21 14:48:25 +02:00
Silvan Calarco	ce9a6d734c	New openmamba menu icon	2013-05-18 18:42:13 +02:00