forked from mirrored-repos/iso-profiles
Merge branch 'master'
This commit is contained in:
commit
4a427fadaf
11 changed files with 9 additions and 112 deletions
|
@ -136,7 +136,7 @@ qt5ct # required by manjaro-cinnamon settings
|
|||
>extra celluloid
|
||||
>extra deluge
|
||||
>extra ffmpegthumbnailer
|
||||
firefox
|
||||
>basic firefox # vivaldi included in full edition
|
||||
flatpak
|
||||
>extra galculator
|
||||
>extra gcolor3
|
||||
|
@ -175,7 +175,7 @@ touchegg # optional for cinnamon
|
|||
tree
|
||||
>extra udiskie
|
||||
vi
|
||||
>extra vivaldi
|
||||
>extra vivaldi # firefox included in minimal edition
|
||||
>extra vivaldi-ffmpeg-codecs # optional for vivaldi
|
||||
>extra webapp-manager
|
||||
xdg-utils
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
calamares
|
||||
cinnamon-live
|
||||
clonezilla
|
||||
grub-theme-live-manjaro
|
||||
gsmartcontrol
|
||||
manjaro-live-skel
|
||||
manjaro-live-systemd
|
||||
mkinitcpio-nfs-utils
|
||||
nbd
|
1
community/cinnamon/Packages-Live
Symbolic link
1
community/cinnamon/Packages-Live
Symbolic link
|
@ -0,0 +1 @@
|
|||
../../shared/Packages-Live
|
|
@ -1,86 +0,0 @@
|
|||
>i686 archlinux32-keyring
|
||||
>manjaro manjaro-release
|
||||
acpi
|
||||
acpid
|
||||
amd-ucode
|
||||
b43-fwcutter
|
||||
bash-completion
|
||||
btrfs-progs
|
||||
bzip2
|
||||
coreutils
|
||||
cpupower
|
||||
cronie
|
||||
cryptsetup
|
||||
device-mapper
|
||||
diffutils
|
||||
dmraid
|
||||
dnsmasq
|
||||
dosfstools
|
||||
e2fsprogs
|
||||
ecryptfs-utils
|
||||
efibootmgr
|
||||
exfatprogs
|
||||
f2fs-tools
|
||||
file
|
||||
filesystem
|
||||
findutils
|
||||
gawk
|
||||
gcc-libs
|
||||
gettext
|
||||
glibc
|
||||
grep
|
||||
grub
|
||||
gzip
|
||||
haveged
|
||||
inetutils
|
||||
intel-ucode
|
||||
iproute2
|
||||
iptables
|
||||
iputils
|
||||
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
|
||||
networkmanager
|
||||
nfs-utils
|
||||
ntfs-3g
|
||||
os-prober
|
||||
pacman
|
||||
pciutils
|
||||
perl
|
||||
procps-ng
|
||||
psmisc
|
||||
reiserfsprogs
|
||||
rsync
|
||||
s-nail
|
||||
sed
|
||||
shadow
|
||||
sudo
|
||||
sysfsutils
|
||||
systemd-sysvcompat
|
||||
tar
|
||||
texinfo
|
||||
tlp
|
||||
usbutils
|
||||
util-linux
|
||||
vi
|
||||
wget
|
||||
which
|
||||
wireless-regdb
|
||||
wpa_supplicant
|
||||
xfsprogs
|
||||
zsh
|
1
community/cinnamon/Packages-Root
Symbolic link
1
community/cinnamon/Packages-Root
Symbolic link
|
@ -0,0 +1 @@
|
|||
../../shared/Packages-Root
|
|
@ -251,7 +251,6 @@ manjaro-application-utility # optional for manjaro-hello
|
|||
manjaro-hello
|
||||
manjaro-settings-manager
|
||||
manjaro-settings-manager-notifier
|
||||
manjaro-starter
|
||||
#mousetweaks
|
||||
>extra nautilus-admin
|
||||
nautilus-empty-file
|
||||
|
|
|
@ -251,7 +251,6 @@ manjaro-application-utility # optional for manjaro-hello
|
|||
manjaro-hello
|
||||
manjaro-settings-manager
|
||||
manjaro-settings-manager-notifier
|
||||
manjaro-starter
|
||||
#mousetweaks
|
||||
>extra nautilus-admin
|
||||
nautilus-empty-file
|
||||
|
|
|
@ -248,7 +248,6 @@ manjaro-application-utility # optional for manjaro-hello
|
|||
manjaro-hello
|
||||
manjaro-settings-manager
|
||||
manjaro-settings-manager-notifier
|
||||
manjaro-starter
|
||||
#mousetweaks
|
||||
>extra nautilus-admin
|
||||
nautilus-empty-file
|
||||
|
|
|
@ -180,7 +180,6 @@ konsole
|
|||
ksystemlog
|
||||
kwalletmanager
|
||||
gwenview
|
||||
partitionmanager
|
||||
>extra print-manager
|
||||
>extra skanlite
|
||||
spectacle
|
||||
|
@ -292,3 +291,4 @@ power-profiles-daemon
|
|||
|
||||
## Misc
|
||||
>basic squashfs-tools
|
||||
qt5-tools
|
||||
|
|
|
@ -5,6 +5,6 @@ mkinitcpio-nfs-utils
|
|||
nbd
|
||||
|
||||
## OEM
|
||||
calamares
|
||||
calamares5
|
||||
calamares-oem-modules
|
||||
calamares-oem-kde-settings
|
||||
|
|
|
@ -23,8 +23,8 @@ import libcalamares
|
|||
import os
|
||||
import logging
|
||||
import crypt
|
||||
from shutil import copytree
|
||||
from os.path import join, exists
|
||||
from distutils.dir_util import copy_tree
|
||||
from libcalamares.utils import target_env_call
|
||||
|
||||
|
||||
|
@ -69,7 +69,7 @@ class ConfigOem:
|
|||
|
||||
def copy_folder(self, source, target):
|
||||
if exists("/" + source):
|
||||
copy_tree("/" + source, join(self.root, target), preserve_symlinks=1)
|
||||
copytree("/" + source, join(self.root, target), symlinks=True, ignore_dangling_symlinks=True, dirs_exist_ok=True)
|
||||
|
||||
def run(self):
|
||||
target_env_call(['groupadd', 'autologin'])
|
||||
|
@ -89,13 +89,6 @@ class ConfigOem:
|
|||
if exists(join(self.root, "usr/bin/grub-set-bootflag")):
|
||||
target_env_call(["grub-editenv", "-", "set", "menu_auto_hide=1", "boot_success=1"])
|
||||
|
||||
# Remove unneeded ucode
|
||||
cpu_ucode = target_env_call(["hwinfo", "--cpu", "|", "grep", "Vendor:", "-m1", "|", "cut", "-d\'\"\'", "-f2"])
|
||||
if cpu_ucode == "AuthenticAMD":
|
||||
self.remove_pkg("intel-ucode", "boot/intel-ucode.img")
|
||||
elif cpu_ucode == "GenuineIntel":
|
||||
self.remove_pkg("amd-ucode", "boot/amd-ucode.img")
|
||||
|
||||
return None
|
||||
|
||||
|
||||
|
|
|
@ -248,7 +248,6 @@ manjaro-application-utility # optional for manjaro-hello
|
|||
manjaro-hello
|
||||
manjaro-settings-manager
|
||||
manjaro-settings-manager-notifier
|
||||
manjaro-starter
|
||||
#mousetweaks
|
||||
>extra nautilus-admin
|
||||
nautilus-empty-file
|
||||
|
|
|
@ -10,5 +10,6 @@ manjaro-rescue
|
|||
mkinitcpio-nfs-utils
|
||||
nbd
|
||||
snapper-gui
|
||||
testdisk
|
||||
timeshift
|
||||
virtualbox-guest-utils
|
||||
|
|
Loading…
Reference in a new issue