From ad6610daaf652812be805a74562df72863831daf Mon Sep 17 00:00:00 2001 From: natemaia Date: Sat, 21 Sep 2019 10:02:01 -0700 Subject: [PATCH] Move pulseaudio packages into installer rather than iso Copy /etc/netctl to install incase not using networkmanager --- archlabs-installer | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/archlabs-installer b/archlabs-installer index 1c47a5c..3450cec 100755 --- a/archlabs-installer +++ b/archlabs-installer @@ -104,15 +104,18 @@ SYS='Unknown' # bios type to be determined: UEFI/BIOS export DIALOGOPTS="--cr-wrap" # see `man dialog` # baseline -BASE_PKGS="base-devel xorg xorg-drivers sudo git gvfs gtk3 pavucontrol tumbler xdg-user-dirs playerctl " -BASE_PKGS+="ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good scrot" +BASE_PKGS="base-devel xorg xorg-drivers sudo git gvfs gtk3 libmad libmatroska " +BASE_PKGS+="tumbler playerctl pulseaudio pulseaudio-alsa pavucontrol pamixer scrot " +BASE_PKGS+="xdg-user-dirs ffmpeg gstreamer gst-libav gst-plugins-base gst-plugins-good" # archlabs base -AL_BASE_PKGS="archlabs-skel-base archlabs-fonts archlabs-themes archlabs-icons archlabs-wallpapers archlabs-scripts archlabs-baph" +AL_BASE_PKGS="archlabs-skel-base archlabs-fonts archlabs-themes " +AL_BASE_PKGS+="archlabs-icons archlabs-wallpapers archlabs-scripts archlabs-baph" # extras for window managers -WM_BASE_PKGS="arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome volumeicon xclip exo laptop-detect " -WM_BASE_PKGS+="xdotool compton wmctrl gnome-keyring dunst feh gsimplecal xfce4-power-manager xfce4-settings" +WM_BASE_PKGS="arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome " +WM_BASE_PKGS+="volumeicon xclip exo laptop-detect xdotool compton wmctrl feh " +WM_BASE_PKGS+="gnome-keyring dunst gsimplecal xfce4-power-manager xfce4-settings" # } @@ -1395,7 +1398,8 @@ install_base() [[ -e /run/archiso/sfs/airootfs && $KERNEL == 'linux' ]] && cp -vf $RUN/x86_64/vmlinuz $MNT/boot/vmlinuz-linux - cp -fv /etc/resolv.conf $MNT/etc/ + [[ -d /etc/netctl ]] && cp -rfv /etc/netctl $MNT/etc/ + [[ -f /etc/resolv.conf ]] && cp -fv /etc/resolv.conf $MNT/etc/ [[ -e /etc/NetworkManager/system-connections ]] && cp -rvf /etc/NetworkManager/system-connections $MNT/etc/NetworkManager/ echo "LANG=$MYLOCALE" > $MNT/etc/locale.conf