xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto adjust root size for live and only allow one session

Browse Source
This commit is contained in:
natemaia 2019-10-18 23:07:40 -07:00
parent d220b79629
commit 2c4b9333f5
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
archlabs-installer
View File

@ -2174,38 +2174,28 @@ msg()
live() live()
{ {
local e=0 local ses="$1"
if (( $# == 0 )); then if ! select_keymap; then
msg "No Session" "\nRunning live requires a session to use.\n\nExiting..\n" 2
clear
die 1
elif ! select_keymap; then
clear clear
die 0 die 0
elif ! net_connect; then elif ! net_connect; then
msg "Not Connected" "\nRunning live requires an active internet connection.\n\nExiting..\n" 2 msg "Not Connected" "\nRunning live requires an active internet connection.\n\nExiting..\n" 2
die 1 die 1
elif (( $(awk '/MemTotal/ {print int($2 / 1024)}' /proc/meminfo) < 4096)); then
msg "Not Enough Memory" "\nRunning live requires at least 4G of system memory.\n\nExiting..\n" 2
die 1
else else
clear clear
mount /run/archiso/cowspace -o remount,size=2G
install_mirrorlist "/etc/pacman.d/mirrorlist" install_mirrorlist "/etc/pacman.d/mirrorlist"
pacman -Syyu archlinux-keyring --needed --noconfirm || die 1 pacman -Syyu archlinux-keyring --needed --noconfirm || die 1
pacman -S $AL_BASE_PKGS xorg-xinit xorg-server --needed --noconfirm || die 1 pacman -S $AL_BASE_PKGS xterm xorg-xinit xorg-server --needed --noconfirm || die 1
for ses; do
case "$ses" in case "$ses" in
dwm) i3-gaps|oepnbox|fluxbox|bspwm|awesome) pacman -S "$ses" $WM_BASE_PKGS ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
pacman -S git --needed --noconfirm || die 1 gnome|plasma|cinnamon|xfce4) pacman -S "$ses" ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
install_suckless "/root" nochroot dwm) { pacman -S git --needed --noconfirm || die 1; }; install_suckless "/root" nochroot ;;
;;
i3-gaps|oepnbox|fluxbox|bspwm|awesome)
pacman -S "$ses" $WM_BASE_PKGS ${WM_EXT[$ses]} xterm --needed --noconfirm || die 1
;;
gnome|plasma|cinnamon|xfce4)
pacman -S "$ses" ${WM_EXT[$ses]} xterm --needed --noconfirm || die 1
;;
*) echo "error: invalid session for -l, --live, see -h, --help"; die 1 ;;
esac esac
done
pacman -Scc --noconfirm pacman -Scc --noconfirm
rm -rf "/var/cache/pacman/pkg/"* rm -rf "/var/cache/pacman/pkg/"*
cp -rfT /etc/skel /root || die 1 cp -rfT /etc/skel /root || die 1
@ -2457,7 +2447,11 @@ else
case "$1" in case "$1" in
-d|--debug) debug ;; -d|--debug) debug ;;
-h|--help) usage "$0" ;; -h|--help) usage "$0" ;;
-l|--live) shift; live "$@" ;; -l|--live)
case "$2" in
gnome|cinnamon|dwm|plasma|xfce4|i3-gaps|oepnbox|fluxbox|bspwm|awesome) live "$2" ;;
*) echo "error: invalid session for -l, --live, see -h, --help"; die 1 ;;
esac ;;
esac esac
fi fi