Move pulseaudio packages into installer rather than iso

Copy /etc/netctl to install incase not using networkmanager
This commit is contained in:
natemaia 2019-09-21 10:02:01 -07:00
parent 108450dd69
commit ad6610daaf

View File

@ -104,15 +104,18 @@ SYS='Unknown' # bios type to be determined: UEFI/BIOS
export DIALOGOPTS="--cr-wrap" # see `man dialog` export DIALOGOPTS="--cr-wrap" # see `man dialog`
# baseline # baseline
BASE_PKGS="base-devel xorg xorg-drivers sudo git gvfs gtk3 pavucontrol tumbler xdg-user-dirs playerctl " BASE_PKGS="base-devel xorg xorg-drivers sudo git gvfs gtk3 libmad libmatroska "
BASE_PKGS+="ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good scrot" 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 # 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 # extras for window managers
WM_BASE_PKGS="arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome volumeicon xclip exo laptop-detect " WM_BASE_PKGS="arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome "
WM_BASE_PKGS+="xdotool compton wmctrl gnome-keyring dunst feh gsimplecal xfce4-power-manager xfce4-settings" 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 [[ -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/ [[ -e /etc/NetworkManager/system-connections ]] && cp -rvf /etc/NetworkManager/system-connections $MNT/etc/NetworkManager/
echo "LANG=$MYLOCALE" > $MNT/etc/locale.conf echo "LANG=$MYLOCALE" > $MNT/etc/locale.conf