Release 2.3.92

bootrecover: support for EFI (currently only target x86_64-efi)
bootrecover: remove other O.S. partiton selection, rely on grub-install + os-prober for automatic configuration
2013-06-12 01:46:46 +02:00 · 2013-06-11 17:19:57 +02:00 · 2013-06-11 15:50:40 +02:00 · 2013-06-11 14:05:55 +02:00 · 2013-05-22 15:56:00 +02:00 · 2013-05-21 14:48:25 +02:00
18 changed files with 274 additions and 281 deletions
--- a/23
+++ b/23
@@ -1,9 +1,17 @@
-# Makefile for openmamba-desktop-base
-# Copyright (C) 2004-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Makefile for desktop-base-openmamba package
+# Copyright (C) 2004-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com>

 include VERSION
-include SRPMSVERSIONS
+
+ARCH:=`uname -i`
+
+ifeq ($(ARCH), arm)
+SRPMSVERSIONSFILE = SRPMSVERSIONS.arm
+else
+SRPMSVERSIONSFILE = SRPMSVERSIONS
+endif
+include $(SRPMSVERSIONSFILE)

 PACKAGE = desktop-base-openmamba
 DISTROID = openmamba
@@ -27,7 +35,6 @@ SCREENSAVER =

 DISTROid = $(shell echo $(DISTROID) | tr A-Z a-z)
 DISTROICON = $(DISTROid)
-ARCH=`uname -i`

 DESTDIR =

@@ -97,7 +104,7 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po)
 .SUFFIXES: .in .po .mo

 .in:; @echo "generating $@..."; \
-       if [ "$(ARCH)" != "x86_64" ]; then ARCH=i386; else ARCH=$(ARCH); fi; \
+       if [ "$(ARCH)" != "x86_64" -a "$(ARCH)" != "arm" ]; then ARCH=i386; else ARCH=$(ARCH); fi; \
       sed "s,@distroID@,$(DISTROID),g;\
            s,@distroid@,$(DISTROid),g;\
            s,@distroicon@,$(DISTROICON),g;\
@@ -165,7 +172,11 @@ endif
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
 	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
+	cp -r etc/profile.d $(DESTDIR)$(sysconfdir)/
+	cp -r etc/sudoers.d $(DESTDIR)$(sysconfdir)/
+	cp -r etc/sysconfig $(DESTDIR)$(sysconfdir)/
 	cp -r etc/xprofile.d $(DESTDIR)$(sysconfdir)/
+	chmod 755 $(DESTDIR)$(sysconfdir)/profile.d/*.sh
 	chmod 755 $(DESTDIR)$(sysconfdir)/xprofile.d/*.sh
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
 	cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
@@ -201,7 +212,7 @@ install-distromenu: dist-update
 install-srpms:
 	@$(INSTALL_DIR) $(DESTDIR)$(distrosrpmsdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfigdir)
-	@cat SRPMSVERSIONS > $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE)
+	@cat $(SRPMSVERSIONSFILE) > $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE)
 	for pck in $(pck_srpms); do\
 	   rpmbuild -bs SRPMS/$$pck/$${pck}.spec \
 	      --define="_sourcedir `pwd`/SRPMS/$$pck" \
--- a/SRPMS/sun-java7/sun-java7.spec.in
+++ b/SRPMS/sun-java7/sun-java7.spec.in
@@ -8,7 +8,7 @@
 %define        javaver           %{major}.%{minor}
 %define        jppname           java-%{javaver}-%{origin}
 %define        javaws_ver        %{javaver}
-%define        toplevel_dir      jdk%{javaver}_06
+%define        toplevel_dir      jdk%{javaver}_%{MINOR}
 %define        distversion       %{version}
 %define        label             -%{name}
 %define        jdklnk            jdk7-%{origin}
@@ -23,7 +23,7 @@

 Name:          sun-java7
 Version:       @sunjava7ver@
-Release:       2@distroext@
+Release:       1@distroext@
 Epoch:         1
 Summary:       Sun Java Developer's Kit
 Group:         System/Libraries/Java
@@ -53,7 +53,7 @@ Sun Java Developer's Kit.
 %package runtime
 Summary:       Sun Java Platform Runtime Environment
 Group:         System/Libraries/Java
-Obsoletes:     j2re
+#Obsoletes:     j2re
 Provides:      j2re = %{version}
 Provides:      jre = %{version}

@@ -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}-b24/jdk-%{version}-linux-i586.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b02/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}-b24/jdk-%{version}-linux-x64.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b02/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}-b24/jdk-%{version}-linux-arm-sfp.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b18/jdk-%{version}-linux-arm-sfp.tar.gz
 tar xf jdk-%{version}-linux-arm-sfp.tar.gz
 %endif

@@ -527,6 +527,7 @@ fi
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
 %ifnarch arm
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/javafx.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/javaws.policy
 %endif
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklist
@@ -593,6 +594,9 @@ fi
 #  %{toplevel_dir}/jre/README %{toplevel_dir}/jre/Welcome.html

 %changelog
+* Wed Apr 10 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 7u17-1mamba
+- update to 7u17
+
 * Sun Aug 19 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 7u6-2mamba
 - rename to sun-java7

--- a/6
+++ b/6
@@ -1,5 +1,5 @@
-FLASHPLUGIN_VERSION=11.2.202.275
+FLASHPLUGIN_VERSION=11.2.202.285
 WIN32CODECS_VERSION=20110131
-SKYPE_VERSION=4.1.0.20
+SKYPE_VERSION=4.2.0.11
 VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
-SUN_JAVA7_VERSION=7u6
+SUN_JAVA7_VERSION=7u17
--- a/SRPMSVERSIONS.arm
+++ b/SRPMSVERSIONS.arm
@@ -0,0 +1,5 @@
+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
--- a/2
+++ b/2
@@ -1 +1 @@
-VERSION = 2.3.18
+VERSION = 2.3.92
--- 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,12 +664,18 @@ function get_udisks_key() {

   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
+      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
@@ -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,17 +144,53 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
      chroot $MOUNTPOINT mkinitrd -f /boot/initramfs-${KVER}.img ${KVER}
   done

-   dcop_write $"Installing bootloader on $INSTALL_BOOTLOADER_DEVICE..." 90
-   echo $"Installing grub bootloader on $INSTALL_BOOTLOADER_DEVICE" | tee -a $LOG_FILE
+   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

-   grub-install $INSTALL_BOOTLOADER_DEVICE --root-directory=$MOUNTPOINT --recheck --no-floppy
+      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

-   [ "$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
-   }
+   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_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/etc/polkit-1/localauthority/10-vendor.d/60-desktop-policy.pkla
+++ b/etc/polkit-1/localauthority/10-vendor.d/60-desktop-policy.pkla
@@ -33,3 +33,10 @@ Action=org.freedesktop.NetworkManager.*
 ResultAny=yes
 ResultInactive=no
 ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=org.kde.kcontrol.kcmclock.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
--- a/etc/profile.d/proxy.sh
+++ b/etc/profile.d/proxy.sh
@@ -0,0 +1,9 @@
+#
+# openmamba system-wide proxy configuration
+#
+[ -e /etc/sysconfig/proxy ] &&  . /etc/sysconfig/proxy
+[ "$http_proxy" ] && export HTTP_PROXY=$http_proxy
+[ "$https_proxy" ] && export HTTPS_PROXY=$https_proxy
+[ "$ftp_proxy" ] && export FTP_PROXY=$ftp_proxy
+[ "$socks_proxy" ] && export SOCKS_PROXY=$socks_proxy
+[ "$no_proxy" ] && export NO_PROXY=$no_proxy
--- a/etc/sudoers.d/proxy
+++ b/etc/sudoers.d/proxy
@@ -0,0 +1 @@
+Defaults env_keep += "ftp_proxy http_proxy https_proxy socks_proxy no_proxy FTP_PROXY HTTP_PROXY HTTPS_PROXY SOCKS_PROXY NO_PROXY"
--- a/etc/sysconfig/proxy
+++ b/etc/sysconfig/proxy
@@ -0,0 +1,17 @@
+# System proxy configuration file
+
+# Here some examples:
+
+# http_proxy=http://proxy.example.com:8080
+# https_proxy=http://proxy.example.com:8080
+# ftp_proxy=http://proxy.example.com:8080
+# socks_proxy=http://proxy.example.com:8080
+# no_proxy=localhost,127.0.0.1
+
+# http_proxy=http://user:password@proxy.example.com:3128
+# https_proxy=http://user:password@proxy.example.com:3128
+# ftp_proxy=http://user:password@proxy.example.com:3128
+
+# http_proxy=http://domain\\user:password@proxy.example.com:8080
+# https_proxy=http://domain\\user:password@proxy.example.com:8080
+# ftp_proxy=http://domain\\user:password@proxy.example.com:8080
--- 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/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
--- a/openmamba-update/openmamba-netsrpms
+++ b/openmamba-update/openmamba-netsrpms
@@ -2,7 +2,7 @@
 #
 # netsrpm-install.sh - Build srpms that download sources from network
 #
-# Copyright (C) 2003-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2003-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005 by Massimo Pintore <massimo.pintore@qilinux.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@qilinux.it>

@@ -13,7 +13,10 @@ rpmdir=$(rpm --eval=%{_rpmdir} 2>/dev/null)
 while [ "$1" ]; do
   case $1 in
      -c) CHECK_MODE=1 ;;
+      -f) FORCE_MODE=1 ;;
      -u) UPGRADE_MODE=1 ;;
+      -h|--help) PACKAGES= ; break ;;
+      -*) echo "Error: invalid option $1; aborting."; exit 1 ;;
      *) PACKAGES="$PACKAGES $1"
   esac
   shift
@@ -21,9 +24,11 @@ done

 if [ -z "$PACKAGES" ]; then
   echo "Usage:
-$me [-c] pkgname ...
+$me [options...] pkgname ...

+Options:
 -c: only check and exit (returns: 0: up-to-date; 1: needs update; 2: not installed)
+-f: force reinstallation if already installed
 -u: only upgrade if already installed
 "
   exit 255
@@ -125,6 +130,9 @@ for pckname in $PACKAGES; do
      RPM_PATH=`find $tmpdir -name \*.rpm`

      # install rpm
+      if [ "$FORCE_MODE" = "1" ]; then
+         sudo smart remove -y $pckname
+      fi
      sudo smart install -y $RPM_PATH
      if [ $? -gt 0 ]; then
         echo "$me: "$"error installing \`$RPM_PATH'."" "$"Aborting..." >&2
Author	SHA1	Message	Date
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
Silvan Calarco	8713ca8727	Release 2.3.21.1	2013-05-03 18:47:30 +02:00
Silvan Calarco	a16817070f	SRPMSVERSIONS.arm: added previously forgotten file	2013-05-03 18:44:52 +02:00
Silvan Calarco	4a232df254	Release 2.3.21	2013-05-02 15:56:55 +02:00
Silvan Calarco	1b60656c73	Added proxy profile.d script which reads /etc/sysconfig/proxy; added sudoers.d file for exporing variables	2013-05-02 15:53:43 +02:00
Silvan Calarco	03fbd206a5	Release 2.3.20	2013-04-18 15:55:02 +02:00
Silvan Calarco	f909f4450b	polkit desktop policy: allow sysadmin user to modify date through kcmclock	2013-04-18 15:47:01 +02:00
Silvan Calarco	476c1e42b0	Release 2.3.19	2013-04-10 19:32:22 +02:00
Silvan Calarco	091b8290ba	flashplugin: update to 11.2.202.280 sun-java7: update to 7u17 (x86*) and 7u10 (arm)	2013-04-10 19:30:33 +02:00
Silvan Calarco	0b5540707d	openmamba-netsrpms: added -f option to force package reinstallation	2013-04-03 15:17:01 +02:00
				`@@ -0,0 +1 @@`
				`Defaults env_keep += "ftp_proxy http_proxy https_proxy socks_proxy no_proxy FTP_PROXY HTTP_PROXY HTTPS_PROXY SOCKS_PROXY NO_PROXY"`