summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2020-02-16 00:03:55 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2020-03-27 19:32:36 -0400
commit66ad6fa683aa6b05e4f6fbd1bbbbb799f4b9cd93 (patch)
treeba4b3c08667fde10ce8672a6a53658f8494cbf64 /configs
parent859b25f8af367b2e4e3dabc236c099ca85fe77ac (diff)
boot calamares from .xinitrc
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/profile/build.sh2
-rw-r--r--configs/profile/packages/packages-mini.all15
-rwxr-xr-xconfigs/profile/rebuild.sh1
-rw-r--r--configs/profile/root-image/etc/skel/.xinitrc18
-rwxr-xr-xconfigs/profile/root-image/root/.language.sh10
-rw-r--r--configs/profile/root-image/root/customize_root_image-constants.inc1
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh14
7 files changed, 50 insertions, 11 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index f115345..dff773a 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -11,7 +11,7 @@ readonly END_COLOR='\033[00m'
# edition-specific data
declare -ar VALID_INITS=('openrc' 'systemd')
-declare -ar VALID_WMDES=('cli' 'lxde' 'mate')
+declare -ar VALID_WMDES=('cli' 'lxde' 'mate' 'mini')
# environment
data_dir=/usr/share/parabolaiso/data
diff --git a/configs/profile/packages/packages-mini.all b/configs/profile/packages/packages-mini.all
new file mode 100644
index 0000000..25a743e
--- /dev/null
+++ b/configs/profile/packages/packages-mini.all
@@ -0,0 +1,15 @@
+# this file specifies the packages that are to be installed
+# in all X+calamares live environments regardless of the architecture or init system
+# but these packages will not be installed in the standard CLI or graphical environments
+
+calamares
+networkmanager
+#TODO: extract new packages: parabola-helpers parabola-skel parabola-wallpapers
+parabola-laf
+parabola-theme-blackmate
+ttf-dejavu
+xcursor-flatbed
+xf86-video-vesa
+xorg-server
+#xorg-twm
+xorg-xinit
diff --git a/configs/profile/rebuild.sh b/configs/profile/rebuild.sh
index dc5796c..c8c791d 100755
--- a/configs/profile/rebuild.sh
+++ b/configs/profile/rebuild.sh
@@ -14,6 +14,7 @@ readonly TARGET='x86_64' # x86_64 target only (default)
readonly INIT='systemd' # SystemD initsystem (default)
readonly WMDE='cli' # CLI (default)
# readonly WMDE='LXDE' # LXDE
+# readonly WMDE='mini' # minimal installer system
readonly TALKING='' # speech and braille disabled (default)
# readonly TALKING='-S' # speech and braille enabled
readonly CACHE='' # net-install (default)
diff --git a/configs/profile/root-image/etc/skel/.xinitrc b/configs/profile/root-image/etc/skel/.xinitrc
index b2cccac..09d948e 100644
--- a/configs/profile/root-image/etc/skel/.xinitrc
+++ b/configs/profile/root-image/etc/skel/.xinitrc
@@ -37,13 +37,11 @@ fi
# start a destop environment
-if [ "${DESKTOP_SESSION}" == 'LXDE' ]
-then exec startlxde
-elif [ "${DESKTOP_SESSION}" == 'mate' ]
-then exec mate-session
-else twm &
- xclock -geometry 50x50-1+1 &
- xterm -geometry 80x50+494+51 &
- xterm -geometry 80x20+494-0 &
- exec xterm -geometry 80x66+0+0 -name login
-fi
+case ${DESKTOP_SESSION} in
+ 'LXDE' ) exec startlxde ;;
+ 'mate' ) exec mate-session ;;
+ 'mini' ) xrandr -s 1024x768 &
+ exec sudo calamares -D 6 -geometry +0+64 ;;
+ * ) twm &
+ exec xterm -geometry 80x66+0+0 -name login ;;
+esac
diff --git a/configs/profile/root-image/root/.language.sh b/configs/profile/root-image/root/.language.sh
index f3f6950..bc8e9f5 100755
--- a/configs/profile/root-image/root/.language.sh
+++ b/configs/profile/root-image/root/.language.sh
@@ -11,6 +11,10 @@ readonly LANG_DEFAULT='en_US.UTF-8'
readonly KEYMAP_TITLE="System keymap selection"
readonly KEYMAP_PROMPT="Choose your keymap:"
readonly KEYMAP_DEFAULT='us'
+readonly INTERFACE_TITLE="Launch installer or command-line"
+readonly INTERFACE_PROMPT="Would you like to start the installer, or drop onto the command line?"
+readonly INTERFACE_DEFAULT='calamares'
+readonly INTERFACES=( 'calamares' 'wizard' 'cli' )
readonly -a LANGUAGES=( 'en_US.UTF-8' "English" \
'eo' "Esperanto" \
@@ -196,4 +200,10 @@ then keymap=$(Prompt "$KEYMAP_TITLE" "$KEYMAP_PROMPT" $KEYMAP_DEFAULT "${KEYMAPS
sed -i "s/^XKBMAP=.*/XKBMAP=${keymap}/" /root/.codecheck
fi
+
+## prompt to launch installer or CLI ##
+
+interface=$(Prompt "$INTERFACE_TITLE" "$INTERFACE_PROMPT" $INTERFACE_DEFAULT "${INTERFACES[@]}")
+[ "${interface}" == "" ] && interface=$INTERFACE_DEFAULT
+
clear
diff --git a/configs/profile/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc
index 69d60a7..7c0a98e 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/root/customize_root_image-constants.inc
@@ -75,6 +75,7 @@ readonly ROOT_SKEL_FILES="/etc/skel/.bash_logout \
/etc/skel/.bash_profile \
/etc/skel/install-openrc-lxde.sh \
/etc/skel/install-systemd-mate.sh"
+readonly MINI_SKEL_FILES="/etc/skel/.xinitrc"
readonly LIVE_USER=parabola
readonly DEFAULT_USER_GROUPS="adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel"
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 92e4617..7dc98ef 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -72,6 +72,20 @@ case "${ISO_WMDE}" in
sed -i "s|_DESKTOP_SESSION_||" /root/.bash_profile
;;
+'mini' ) # configure installer-only session
+ cp ${ROOT_SKEL_FILES} /root/
+ cp ${MINI_SKEL_FILES} /root/
+# sed -i "s|_DESKTOP_SESSION_|mini|" /root/.bash_profile
+sed -i "s|_DESKTOP_SESSION_||" /root/.bash_profile
+ cat > /root/.gtkrc-2.0 << END
+gtk-theme-name="parabola-blackmate"
+gtk-icon-theme-name="Adwaita"
+gtk-font-name="Sans 10"
+gtk-cursor-theme-name="FlatbedCursors-Blue"
+gtk-cursor-theme-size=18
+END
+ ;;
+
* ) # configure GUI login session
# configure live user