add needed files to run installer from grub menu's Install

calamares-install-setup

@@ -0,0 +1,44 @@
+#!/bin/sh
+# tpgxyz@gmail.com
+
+if grep -q '\binstall\b' /proc/cmdline; then
+. /etc/locale.conf
+
+# ensure plymouth really has stopped
+    if pgrep "plymouthd" > /dev/null 2>&1; then
+	/bin/plymouth quit --retain-splash
+    fi
+
+/bin/systemctl stop crond.service &
+
+xset -dpms
+xset s off
+
+if [ -x /usr/bin/openbox ]; then
+    /usr/bin/openbox &
+else
+    echo "openbox not found. Exiting."
+    sleep 30
+    reboot
+fi
+sleep 1
+
+    if [ "$(pidof openbox)" ]; then
+	/usr/bin/calamares
+	sleep 1
+    else
+	echo "Can not start draklive-install. Rebooting..."
+	sleep 5
+    fi
+
+# check if we are booted from cd drom to eject it
+blkid /dev/sr0 >/dev/null 2>&1
+if [[ $? -eq 0 ]]; then
+    eject
+    sleep 10
+fi
+
+sync
+reboot
+
+fi

calamares-install-start

@@ -2,32 +2,11 @@
 # tpgxyz@gmail.com
 
 if grep -q '\binstall\b' /proc/cmdline; then
-    . /etc/locale.conf
-
-    # ensure plymouth really has stopped
-    if pgrep "plymouthd" > /dev/null 2>&1; then
-	/bin/plymouth quit --retain-splash
-    fi
-
-    /bin/systemctl stop crond.service &
-
-    xset -dpms
-    xset s off
-
-    if [ -e /usr/bin/startx ] && [ -x /usr/bin/calamares ]; then
-	/usr/bin/startx /usr/bin/calamares $* -- -dpi 96 vt1 -background none
+    if [ -x /usr/bin/startx ] && [ -x /usr/sbin/calamares-install-setup ]; then
+	/usr/bin/startx /usr/sbin/calamares-install-setup $* -- -dpi 96 vt1 -background none
     else
-	echo "calamares-install: critical programs are missing, check your system!"
+	echo "calamares-install-setup: critical programs are missing, check you system!"
+	sleep 30
+	reboot
     fi
-
-    # check if we are booted from cd drom to eject it
-    blkid /dev/sr0 >/dev/null 2>&1
-    if [[ $? -eq 0 ]]; then
-	eject
-	sleep 10
-    fi
-
-    sync
-    reboot
-
 fi

calamares.service

@@ -4,8 +4,8 @@ DefaultDependencies=no
 After=livesys-late.service systemd-user-sessions.service getty@tty1.service plymouth-quit.service
 Conflicts=getty@tty1.service
 Conflicts=getty@%i.service
-Conflicts=display-manager.serivce
-Before=display-manager.serivce
+Conflicts=display-manager.service
+Before=display-manager.service
 Before=getty.target
 Wants=NetworkManager.service
 ConditionKernelCommandLine=|install
@@ -26,4 +26,4 @@ KillMode=process
 RemainAfterExit=yes
 
 [Install]
-WantedBy=graphical.target
+WantedBy=multi-user.target

calamares.spec

@@ -19,10 +19,11 @@ Source1:	calamares-partitionmanager-%{partdate}.tar.xz
 Source2:	calamares.rpmlintrc
 Source3:	%{name}.service
 Source4:	%{name}-install-start
-Source5:	omv-bootloader.conf
-Source6:	omv-displaymanager.conf
-Source7:	omv-finished.conf
-Source8:	omv-fstab.conf
+Source5:	%{name}-install-setup
+Source6:	omv-bootloader.conf
+Source7:	omv-displaymanager.conf
+Source8:	omv-finished.conf
+Source9:	omv-fstab.conf
 Source10:	omv-grubcfg.conf
 Source11:	omv-keyboard.conf
 Source12:	omv-locale.conf
@@ -113,6 +114,8 @@ Requires:	shadow
 Requires:	polkit
 Requires:	urpmi
 Requires:	squashfs-tools
+# (tpg) needed for calamares-install-setup
+Requires:	openbox
 ExclusiveArch:	%{ix86} x86_64
 
 %description
@@ -163,10 +166,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/calamares/branding/auto
 touch %{buildroot}%{_sysconfdir}/calamares/branding/auto/branding.desc
 
 # (tpg) settings specific for OMV
-install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/calamares/modules/bootloader.conf
-install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/calamares/modules/displaymanager.conf
-install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/calamares/modules/finished.conf
-install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/calamares/modules/fstab.conf
+install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/calamares/modules/bootloader.conf
+install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/calamares/modules/displaymanager.conf
+install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/calamares/modules/finished.conf
+install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/calamares/modules/fstab.conf
 install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/calamares/modules/grubcfg.conf
 install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/calamares/modules/keyboard.conf
 install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/calamares/modules/locale.conf
@@ -185,6 +188,7 @@ install -m 644 %{SOURCE22} %{buildroot}%{_sysconfdir}/calamares/modules/removeus
 mkdir -p %{buildroot}{%{_unitdir},%{_sbindir}}
 install -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
 install -m 755 %{SOURCE4} %{buildroot}%{_sbindir}/%{name}-install-start
+install -m 744 %{SOURCE5} %{buildroot}%{_sbindir}/%{name}-install-stetup
 
 install -d %{buildroot}%{_presetdir}
 cat > %{buildroot}%{_presetdir}/90-%{name}.preset << EOF
@@ -249,6 +253,7 @@ EOF
 %{_presetdir}/90-%{name}.preset
 %{_unitdir}/%{name}.service
 %{_sbindir}/%{name}-install-start
+%{_sbindir}/%{name}-install-setup
 %{_bindir}/calamares
 %{_datadir}/calamares/settings.conf
 %{_datadir}/calamares/branding/default/*

omv-packages.conf

@@ -28,4 +28,5 @@ operations:
   - remove:
       - calamares
       - drakx-finish-install
+      - drakx-installer-matchbox
       - squashfs-tools