diff --git a/.abf.yml b/.abf.yml index 75fdd89..023a1e2 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,5 +1,5 @@ sources: OpenMandriva-adverts.tar.xz: d0833604f1ce5bdcc7a1560cc51f4c392a9ed665 - calamares-1.0.0-20150418.tar.xz: c32e45641414b13b02aefa4e8a61f807558da665 + calamares-1.0.0-20150421.tar.xz: 1592937b4d931a7295d737d122c91c2538bc26e8 calamares-partitionmanager-20150112.tar.xz: 9fd2828fde3ecb3692868ea186469424c5be580e openmandriva-install.svg: c048a90f14c7c449606e033bf148a11305fa0f70 diff --git a/calamares-install-setup b/calamares-install-setup index fa9c3f3..14751b5 100644 --- a/calamares-install-setup +++ b/calamares-install-setup @@ -24,10 +24,15 @@ fi sleep 1 if [ "$(pidof openbox)" ]; then + # setup background + if [ -e /usr/share/mdk/backgrounds/default.png ] && [ -f /usr/bin/xli ]; then + /usr/bin/xli -onroot -fullscreen /usr/share/mdk/backgrounds/default.png & + fi + /usr/bin/calamares sleep 1 else - echo "Can not start draklive-install. Rebooting..." + echo "Can not start calamares. Rebooting..." sleep 5 fi diff --git a/calamares.spec b/calamares.spec index 3317837..6534554 100644 --- a/calamares.spec +++ b/calamares.spec @@ -1,4 +1,4 @@ -%define calamdate 20150418 +%define calamdate 20150421 %define partdate 20150112 %define major 1 @@ -8,7 +8,7 @@ Summary: Distribution-independent installer framework Name: calamares Version: 1.0.0 -Release: 0.%{calamdate}.2 +Release: 0.%{calamdate}.3 Group: System/Configuration/Other License: GPLv3+ URL: http://calamares.io/ @@ -82,6 +82,7 @@ Requires: console-setup # x11 stuff Requires: setxkbmap Requires: xkbcomp +Requires: xli Requires: NetworkManager Requires: os-prober Requires: e2fsprogs