Merge branch 'master' of ssh://gitlab.manjaro.org:22277/profiles-and-settings/iso-profiles

This commit is contained in:
Philip Müller 2019-10-06 11:16:42 +02:00
commit 46b5b37cfa
6 changed files with 104 additions and 59 deletions

View File

@ -1,10 +1,12 @@
>extra adapta-maia-theme
alsa-firmware
alsa-utils
>extra apparmor
autoconf
automake
avahi
>extra baobab
>extra bauh
binutils
bison
>extra brasero
@ -16,6 +18,7 @@ deepin-file-manager
deepin-gtk-theme
>extra deepin-draw
>extra deepin-image-viewer
deepin-kwin
>extra deepin-movie
>extra deepin-music
>extra deepin-picker
@ -79,6 +82,7 @@ mesa-demos
mlocate
mobile-broadband-provider-info
modemmanager
>extra ms-office-online
>multilib lib32-mesa-demos
netctl
networkmanager
@ -90,6 +94,7 @@ nss-mdns
ntp
openresolv
pamac
>extra pamac-snap-plugin
patch
>extra patchutils
pkg-config
@ -103,6 +108,7 @@ pulseaudio-zeroconf
>extra qpdfview
>extra redshift
screenfetch
>basic squashfs-tools
>extra subversion
>extra sushi
syslog-ng

View File

@ -1,4 +1,4 @@
calamares-git
calamares
deepin-live
grub-theme-live-manjaro
gsmartcontrol
@ -7,4 +7,3 @@ manjaro-live-skel
manjaro-live-systemd
mkinitcpio-nfs-utils
nbd
squashfs-tools

View File

@ -1 +0,0 @@
../../shared/Packages-Root

View File

@ -0,0 +1,93 @@
>i686 archlinux32-keyring
>manjaro manjaro-release
>multilib gcc-libs-multilib
acpi
acpid
amd-ucode
b43-fwcutter
bash-completion
btrfs-progs
bzip2
coreutils
cpupower
crda
cronie
cryptsetup
dbus-x11
device-mapper
dhclient
dhcpcd
diffutils
dmraid
dnsmasq
dosfstools
e2fsprogs
ecryptfs-utils
efibootmgr
exfat-utils
f2fs-tools
file
filesystem
findutils
gawk
gcc-libs
gettext
glibc
grep
grub
gzip
haveged
inetutils
intel-ucode
iproute2
iptables
iputils
ipw2100-fw
ipw2200-fw
jfsutils
KERNEL
less
licenses
linux-firmware
logrotate
lsb-release
lvm2
man-db
man-pages
manjaro-firmware
manjaro-system
mdadm
memtest86+
mhwd
mhwd-db
mkinitcpio-openswap
nano
nfs-utils
ntfs-3g
os-prober
pacman
pciutils
perl
procps-ng
psmisc
reiserfsprogs
rsync
s-nail
sed
shadow
spectre-meltdown-checker
sudo
sysfsutils
systemd-fsck-silent
systemd-sysvcompat
tar
texinfo
tlp
usbutils
util-linux
vi
wget
which
wpa_supplicant
xfsprogs
zsh

View File

@ -1,61 +1,11 @@
##########################################
###### use this file in the profile ######
##########################################
#! /bin/bash
# use multilib packages; x86_64 only
# multilib="true"
# default displaymanager: none
# supported; lightdm, sddm, gdm, lxdm, mdm
displaymanager="lightdm"
# Set to false to disable autologin in the livecd
# autologin="true"
nonfree_mhwd="true"
# nonfree xorg drivers
# nonfree_mhwd="true"
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
################ install ################
# possible values: grub;systemd-boot
# efi_boot_loader="grub"
# configure calamares for netinstall
# netinstall="false"
# configure calamares to use chrootcfg instead of unpackfs
# chrootcfg="false"
# use geoip
# geoip="true"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw')
disable_systemd=('pacman-init')
# the same workgroup name if samba is used
# smb_workgroup=""
################# livecd #################
# unset defaults to given value
hostname="manjaro-deepin"
# unset defaults to given value
# username="manjaro"
# unset defaults to given value
# password="manjaro"
# the login shell
# defaults to bash
# login_shell=/bin/bash
# unset defaults to given values
# addgroups="lp,network,power,wheel"
# unset defaults to given values
# names must match systemd service names
# services in enable_systemd array don't need to be listed here
# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')

View File

@ -39,8 +39,6 @@ gnome-user-docs
gnome-user-share
gnome-wallpapers
papirus-maia-icon-theme
#gnome-screensaver #if use lightdm we need a screensaver
#gnome-initial-setup
>extra gnome-calendar
>extra bijiben
>extra gnome-characters
@ -163,7 +161,6 @@ yelp
>extra unace
>extra lrzip
>extra gtk3-print-backends
#>extra libreoffice-still
>extra evolution
>extra lollypop
>extra empathy

View File

@ -278,6 +278,7 @@ xdg-su
gtkhash-thunar
manjaro-hotfixes
>basic squashfs-tools
xiccd # enable color profile settings
## Handshake tools
#faucet-tool