forked from mirrored-repos/manjaro-tools
Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
7c7f4466a4 |
23 changed files with 245 additions and 862 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,4 +1,3 @@
|
|||
.idea
|
||||
*~
|
||||
*.tar.gz
|
||||
*.tar.xz
|
||||
|
|
|
|||
5
Makefile
5
Makefile
|
|
@ -1,4 +1,4 @@
|
|||
Version=0.15.14
|
||||
Version=0.15.9
|
||||
|
||||
PREFIX = /usr/local
|
||||
SYSCONFDIR = /etc
|
||||
|
|
@ -13,8 +13,7 @@ BIN_BASE = \
|
|||
bin/manjaro-chroot \
|
||||
bin/fstabgen \
|
||||
bin/signfile \
|
||||
bin/chroot-run \
|
||||
bin/check-yaml
|
||||
bin/chroot-run
|
||||
|
||||
LIBS_BASE = \
|
||||
lib/util.sh \
|
||||
|
|
|
|||
15
README.md
15
README.md
|
|
@ -69,7 +69,7 @@ overriding
|
|||
# log_dir='/var/log/manjaro-tools'
|
||||
|
||||
# custom build mirror server
|
||||
# build_mirror=https://manjaro.moson.eu
|
||||
# build_mirror=https://mirror.netzspielplatz.de/manjaro/packages
|
||||
|
||||
################ buildtree ###############
|
||||
|
||||
|
|
@ -95,13 +95,13 @@ overriding
|
|||
# build_list_iso=default
|
||||
|
||||
# the dist release; default: auto
|
||||
# dist_release=auto
|
||||
# dist_release=17.1
|
||||
|
||||
# the branding; default: auto
|
||||
# dist_branding="MANJARO"
|
||||
# dist_branding="MJRO"
|
||||
|
||||
# unset defaults to given value
|
||||
# kernel="linux54"
|
||||
# kernel="linux414"
|
||||
|
||||
# gpg key; leave empty or commented to skip sfs signing
|
||||
# gpgkey=""
|
||||
|
|
@ -240,9 +240,7 @@ Usage: buildiso [options]
|
|||
-h This help
|
||||
-k <name> Kernel to use
|
||||
[default: linux49]
|
||||
-l Create permalink
|
||||
-m Set SquashFS image mode to persistence
|
||||
-o Enable office installer
|
||||
-p <profile> Buildset or profile [default: default]
|
||||
-q Query settings and pretend build
|
||||
-r <dir> Chroots directory
|
||||
|
|
@ -407,7 +405,6 @@ Usage: deployiso [options]
|
|||
-t Create ISO torrent
|
||||
-u Update remote directory
|
||||
-v Verbose output
|
||||
-z Upload permalinks (shell.osdn.net)
|
||||
~~~
|
||||
|
||||
###### * upload official build list, ie all built iso defined in a build list
|
||||
|
|
@ -421,7 +418,3 @@ deployiso -p official
|
|||
~~~
|
||||
deployiso -p xfce -std
|
||||
~~~
|
||||
|
||||
|
||||
##### Fast compression
|
||||
Lz4 Is very fast but not a good compression ratio, good for testing
|
||||
|
|
|
|||
44
bin/buildiso.in
Normal file → Executable file
44
bin/buildiso.in
Normal file → Executable file
|
|
@ -29,8 +29,6 @@ show_profile(){
|
|||
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
|
||||
|
||||
msg2 "extra: %s" "${extra}"
|
||||
msg2 "office_installer: %s" "${office_installer}"
|
||||
msg2 "permalink: %s" "${permalink}"
|
||||
|
||||
msg2 "netinstall: %s" "${netinstall}"
|
||||
msg2 "chrootcfg: %s" "${chrootcfg}"
|
||||
|
|
@ -44,13 +42,11 @@ show_profile(){
|
|||
msg2 "hostname: %s" "${hostname}"
|
||||
msg2 "username: %s" "${username}"
|
||||
msg2 "password: %s" "${password}"
|
||||
msg2 "user_shell: %s" "${user_shell}"
|
||||
msg2 "login_shell: %s" "${login_shell}"
|
||||
msg2 "addgroups: %s" "${addgroups}"
|
||||
[[ -n ${smb_workgroup} ]] && msg2 "smb_workgroup: %s" "${smb_workgroup}"
|
||||
|
||||
msg2 "enable_systemd: %s" "${enable_systemd[*]}"
|
||||
msg2 "enable_systemd_timers: %s" "${enable_systemd_timers[*]}"
|
||||
msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
|
||||
[[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
|
||||
|
||||
|
|
@ -66,7 +62,7 @@ display_settings(){
|
|||
show_config
|
||||
|
||||
msg "PROFILE:"
|
||||
msg2 "gitlab branch: %s" "${branch}"
|
||||
msg2 "gitlab brach: %s" "${branch}"
|
||||
msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
|
||||
msg2 "build_list_iso: %s" "${build_list_iso}"
|
||||
msg2 "is_build_list: %s" "${is_build_list}"
|
||||
|
|
@ -82,9 +78,6 @@ display_settings(){
|
|||
msg2 "images_only: %s" "${images_only}"
|
||||
msg2 "iso_only: %s" "${iso_only}"
|
||||
msg2 "persist: %s" "${persist}"
|
||||
msg2 "extra: %s" "${full_iso}"
|
||||
msg2 "permalink: %s" "${permalink}"
|
||||
msg2 "office_installer: %s" "${office_installer}"
|
||||
|
||||
msg "DIST SETTINGS:"
|
||||
msg2 "dist_name: %s" "${dist_name}"
|
||||
|
|
@ -114,35 +107,31 @@ iso_only=false
|
|||
verbose=false
|
||||
persist=false
|
||||
initialize=false
|
||||
permalink=false
|
||||
|
||||
usage() {
|
||||
echo "Usage: ${0##*/} [options]"
|
||||
echo " -i Initialize iso-profiles repo [default: ${branch}]"
|
||||
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"
|
||||
echo " -a <arch> Arch [default: ${target_arch}]"
|
||||
echo " -b <branch> Branch [default: ${target_branch}]"
|
||||
echo ' -c Disable clean work dir'
|
||||
echo ' -d <comp> Compression used for build ISO: gzip, lzma, lz4, lzo, xz, zstd'
|
||||
echo " [default: ${iso_compression}]"
|
||||
echo ' -f Build full ISO (extra=true)'
|
||||
echo ' -g <key> The gpg key for sfs signing'
|
||||
echo " [default: ${gpgkey}]"
|
||||
echo " -i Initialize iso-profiles repo [default: ${branch}]"
|
||||
echo ' -k <name> Kernel to use'
|
||||
echo " [default: ${kernel}]"
|
||||
echo ' -l Create permalink'
|
||||
echo ' -m Set SquashFS image mode to persistence'
|
||||
echo ' -n Disable multilib'
|
||||
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"
|
||||
echo ' -o Enable office installer module'
|
||||
echo ' -q Query settings and pretend build'
|
||||
echo ' -r <dir> Chroots directory'
|
||||
echo " [default: ${chroots_iso}]"
|
||||
echo ' -t <dir> Target directory'
|
||||
echo " [default: ${cache_dir_iso}]"
|
||||
echo ' -v Verbose output to log file, show profile detail (-q)'
|
||||
echo ' -k <name> Kernel to use'
|
||||
echo " [default: ${kernel}]"
|
||||
echo ' -g <key> The gpg key for sfs signing'
|
||||
echo " [default: ${gpgkey}]"
|
||||
echo ' -m Set SquashFS image mode to persistence'
|
||||
echo ' -c Disable clean work dir'
|
||||
echo ' -f Build full ISO (extra=true)'
|
||||
echo ' -d <comp> Compression used for build ISO: gzip, lzma, lz4, lzo, xz, zstd'
|
||||
echo " [default: ${iso_compression}]"
|
||||
echo ' -x Build images only'
|
||||
echo ' -z Generate iso only'
|
||||
echo ' Requires pre built images (-x)'
|
||||
echo ' -v Verbose output to log file, show profile detail (-q)'
|
||||
echo ' -q Query settings and pretend build'
|
||||
echo ' -h This help'
|
||||
echo ''
|
||||
echo ''
|
||||
|
|
@ -151,7 +140,7 @@ usage() {
|
|||
|
||||
orig_argv=("$@")
|
||||
|
||||
opts='p:a:b:r:t:k:g:d:cfzxmnvqhilo'
|
||||
opts='p:a:b:r:t:k:g:d:cfzxmvqhi'
|
||||
|
||||
while getopts "${opts}" arg; do
|
||||
case "${arg}" in
|
||||
|
|
@ -164,7 +153,6 @@ while getopts "${opts}" arg; do
|
|||
g) gpgkey="$OPTARG" ;;
|
||||
k) kernel="$OPTARG" ;;
|
||||
m) persist=true ;;
|
||||
n) no_multilib=true ;; # only exist if set here
|
||||
p) build_list_iso="$OPTARG" ;;
|
||||
q) pretend=true ;;
|
||||
r) chroots_iso="$OPTARG" ;;
|
||||
|
|
@ -172,8 +160,6 @@ while getopts "${opts}" arg; do
|
|||
v) verbose=true ;;
|
||||
x) images_only=true ;;
|
||||
z) iso_only=true ;;
|
||||
l) permalink=true ;;
|
||||
o) office_installer=true ;;
|
||||
h|?) usage 0 ;;
|
||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -45,8 +45,6 @@ display_settings(){
|
|||
msg2 "verbose: %s" "${verbose}"
|
||||
msg2 "signiso: %s" "${sign}"
|
||||
msg2 "torrent: %s" "${torrent}"
|
||||
msg2 "shell_upload: %s" "${shell_upload}"
|
||||
msg2 "upd_homepage: %s" "${upd_homepage}"
|
||||
|
||||
if ${torrent}; then
|
||||
msg2 "tracker_url: %s" "${tracker_url}"
|
||||
|
|
@ -77,8 +75,6 @@ update=false
|
|||
verbose=false
|
||||
sign=false
|
||||
alt_storage=false
|
||||
shell_upload=false
|
||||
upd_homepage=false
|
||||
|
||||
rsync_args=(-aP -e ssh)
|
||||
|
||||
|
|
@ -94,14 +90,12 @@ usage() {
|
|||
echo ' -t Create ISO torrent'
|
||||
echo ' -u Update remote directory'
|
||||
echo ' -v Verbose output'
|
||||
echo ' -w Update download page on manjaro.org'
|
||||
echo ' -z Upload permalinks (shell.osdn.net)'
|
||||
echo ''
|
||||
echo ''
|
||||
exit $1
|
||||
}
|
||||
|
||||
opts='adhl:p:qstuvwz'
|
||||
opts='adhl:p:qstuv'
|
||||
|
||||
while getopts "${opts}" arg; do
|
||||
case "${arg}" in
|
||||
|
|
@ -114,8 +108,6 @@ while getopts "${opts}" arg; do
|
|||
t) torrent=true ;;
|
||||
u) update=true; rsync_args+=(-u) ;;
|
||||
v) verbose=true; rsync_args+=(-v --stats) ;;
|
||||
w) upd_homepage=true; shell_upload=true ;;
|
||||
z) shell_upload=true ;;
|
||||
h|?) usage 0 ;;
|
||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -115,12 +115,11 @@ if ${build_locales}; then
|
|||
printf '%s.UTF-8 UTF-8\n' en_US > "$working_dir/etc/locale.gen"
|
||||
printf 'LANG=%s.UTF-8\n' en_US > "$working_dir/etc/locale.conf"
|
||||
printf 'LC_MESSAGES=C\n' >> "$working_dir/etc/locale.conf"
|
||||
|
||||
chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} \
|
||||
${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} \
|
||||
${cache_dir:+-c "$cache_dir"} ${keep_flag})
|
||||
|
||||
exec chroot-run \
|
||||
${chroot_args[*]} \
|
||||
"$working_dir" locale-gen
|
||||
fi
|
||||
|
||||
chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} ${cache_dir:+-c "$cache_dir"} ${keep_flag})
|
||||
|
||||
exec chroot-run \
|
||||
${chroot_args[*]} \
|
||||
"$working_dir" locale-gen
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
MODULES=(loop dm-snapshot)
|
||||
HOOKS=(base udev miso_shutdown miso miso_loop_mnt miso_pxe_common miso_pxe_http miso_pxe_nbd miso_pxe_nfs miso_kms modconf block filesystems keyboard keymap)
|
||||
MODULES="loop dm-snapshot"
|
||||
HOOKS="base udev miso_shutdown miso miso_loop_mnt miso_pxe_common miso_pxe_http miso_pxe_nbd miso_pxe_nfs miso_kms modconf block filesystems keyboard keymap"
|
||||
COMPRESSION="xz"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
HoldPkg = pacman glibc
|
||||
# If upgrades are available for these packages they will be asked for first
|
||||
SyncFirst = manjaro-system archlinux-keyring manjaro-keyring
|
||||
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
#CleanMethod = KeepInstalled
|
||||
#UseDelta = 0.7
|
||||
|
|
@ -34,11 +34,10 @@ Architecture = auto
|
|||
# Misc options
|
||||
#UseSyslog
|
||||
#Color
|
||||
#NoProgressBar
|
||||
#TotalDownload
|
||||
# We cannot check disk space from within a chroot environment
|
||||
#CheckSpace
|
||||
#VerbosePkgLists
|
||||
ParallelDownloads = 4
|
||||
|
||||
# By default, pacman accepts packages signed by keys that its local keyring
|
||||
# trusts (see pacman-key and its man page), as well as unsigned packages.
|
||||
|
|
@ -81,8 +80,13 @@ Include = /etc/pacman.d/mirrorlist
|
|||
SigLevel = PackageRequired
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[community]
|
||||
SigLevel = PackageRequired
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
#[custom]
|
||||
#SigLevel = Optional TrustAll
|
||||
#Server = file:///home/custompkgs
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#LogFile = /var/log/pacman.log
|
||||
#GPGDir = /etc/pacman.d/gnupg/
|
||||
HoldPkg = pacman glibc
|
||||
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
#CleanMethod = KeepInstalled
|
||||
Architecture = auto
|
||||
|
|
@ -30,10 +30,9 @@ Architecture = auto
|
|||
# Misc options
|
||||
#UseSyslog
|
||||
#UseDelta
|
||||
#NoProgressBar
|
||||
#TotalDownload
|
||||
CheckSpace
|
||||
#VerbosePkgLists
|
||||
#ParallelDownloads = 5
|
||||
|
||||
# PGP signature checking
|
||||
# NOTE: None of this will work without running `pacman-key --init` first.
|
||||
|
|
|
|||
|
|
@ -10,10 +10,6 @@ Branch = stable
|
|||
## 2) random - randomly generate the output mirrorlist
|
||||
# Method = rank
|
||||
|
||||
## Filename to use when ranking mirrors
|
||||
## The file must be present in core repo
|
||||
# TestFile = core.db.tar.gz
|
||||
|
||||
## Define protocols and priority
|
||||
## separated by comma 'https,http' or 'http,https'
|
||||
## ATM available protocols are: http, https, ftp
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
HoldPkg = pacman glibc
|
||||
# If upgrades are available for these packages they will be asked for first
|
||||
SyncFirst = manjaro-system archlinux-keyring manjaro-keyring
|
||||
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
#CleanMethod = KeepInstalled
|
||||
#UseDelta = 0.7
|
||||
|
|
@ -34,11 +34,10 @@ Architecture = auto
|
|||
# Misc options
|
||||
#UseSyslog
|
||||
#Color
|
||||
#NoProgressBar
|
||||
#TotalDownload
|
||||
# We cannot check disk space from within a chroot environment
|
||||
#CheckSpace
|
||||
#VerbosePkgLists
|
||||
ParallelDownloads = 4
|
||||
|
||||
# By default, pacman accepts packages signed by keys that its local keyring
|
||||
# trusts (see pacman-key and its man page), as well as unsigned packages.
|
||||
|
|
@ -81,6 +80,10 @@ Include = /etc/pacman.d/mirrorlist
|
|||
SigLevel = PackageRequired
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[community]
|
||||
SigLevel = PackageRequired
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# If you want to run 32 bit applications on your x86_64 system,
|
||||
# enable the multilib repositories as required here.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,9 +8,6 @@
|
|||
# use extra packages as defined in pkglist to activate a full profile
|
||||
# extra="false"
|
||||
|
||||
# use office installer module
|
||||
# office_installer="false"
|
||||
|
||||
################ install ################
|
||||
|
||||
# default displaymanager: none
|
||||
|
|
@ -77,5 +74,3 @@
|
|||
# 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')
|
||||
|
||||
# disable_systemd_live=()
|
||||
|
|
|
|||
|
|
@ -117,54 +117,12 @@ _verify_signature() {
|
|||
return ${_status}
|
||||
}
|
||||
|
||||
_find_dev_by_path () {
|
||||
local path="${1}"
|
||||
local tmp_mnt=/tmp_mnt
|
||||
local _mnt
|
||||
local a d
|
||||
local device
|
||||
|
||||
[[ "$path" ]] || return 1
|
||||
|
||||
mkdir -p "${tmp_mnt}"
|
||||
|
||||
for a in 1 2 3; do
|
||||
for d in $(awk '{ print "/dev/"$4 }' /proc/partitions); do
|
||||
|
||||
# If the device is already mounted, it shouldn't be
|
||||
# unmounted after the check.
|
||||
|
||||
grep -q "^$d " /proc/mounts && {
|
||||
_mnt=$(grep "^$d " /proc/mounts | cut -d ' ' -f 2)
|
||||
unmount=
|
||||
} || {
|
||||
mount -r -t auto "${d}" "${tmp_mnt}" 2> /dev/null || continue
|
||||
_mnt="${tmp_mnt}"
|
||||
unmount=true
|
||||
}
|
||||
|
||||
# File exists in $d. Save $d on $device.
|
||||
|
||||
[[ -f "${_mnt}/${path}" ]] && device="${d}"
|
||||
[[ "${unmount}" ]] && umount "${tmp_mnt}" 2> /dev/null || true
|
||||
[[ "${device}" ]] && {
|
||||
echo "${device}"
|
||||
return
|
||||
}
|
||||
|
||||
done
|
||||
sleep 1
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
run_hook() {
|
||||
[[ -z "${arch}" ]] && arch="$(uname -m)"
|
||||
[[ -z "${copytoram_size}" ]] && copytoram_size="75%"
|
||||
[[ -z "${misobasedir}" ]] && misobasedir="manjaro"
|
||||
|
||||
[[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="manjaro"
|
||||
misodevice=$(_find_dev_by_path /.miso)
|
||||
[[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
|
||||
[[ -z "${misodevice}" ]] && misodevice="/dev/disk/by-label/${misolabel}"
|
||||
[[ -z "${cow_spacesize}" ]] && cow_spacesize="256M"
|
||||
[[ -z "${overlay_root_size}" ]] && overlay_root_size="75%"
|
||||
|
|
|
|||
|
|
@ -45,12 +45,6 @@ run_hook () {
|
|||
[[ -z "${img_flags}" ]] && img_flags="defaults"
|
||||
if [[ "${img_loop}" ]]; then
|
||||
img_dev=$(find_dev_by_path "${img_loop}")
|
||||
|
||||
if [[ -z "${img_dev}" ]]; then
|
||||
[[ -b "/dev/disk/by-label/${img_label}" ]] &&
|
||||
img_dev="/dev/disk/by-label/${img_label}"
|
||||
fi
|
||||
|
||||
mount_handler="miso_loop_mount_handler"
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
run_cleanuphook() {
|
||||
rm -rf /usr/lib/modules
|
||||
cp -ax /. /run/initramfs
|
||||
cp -ax / /run/initramfs
|
||||
}
|
||||
|
||||
# vim: set ft=sh ts=4 sw=4 et:
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ prepare_initcpio(){
|
|||
|
||||
prepare_initramfs(){
|
||||
cp ${DATADIR}/mkinitcpio.conf $1/etc/mkinitcpio-${iso_name}.conf
|
||||
local _kernver=$(cat $1/usr/lib/modules/*/kernelbase | awk -F'-' '{print $1}')
|
||||
local _kernver=$(cat $1/usr/lib/modules/*/version)
|
||||
if [[ -n ${gpgkey} ]]; then
|
||||
su ${OWNER} -c "gpg --export ${gpgkey} >${USERCONFDIR}/gpgkey"
|
||||
exec 17<>${USERCONFDIR}/gpgkey
|
||||
|
|
@ -39,9 +39,10 @@ prepare_initramfs(){
|
|||
prepare_boot_extras(){
|
||||
cp $1/boot/amd-ucode.img $2/amd_ucode.img
|
||||
cp $1/boot/intel-ucode.img $2/intel_ucode.img
|
||||
cp $1/usr/share/licenses/amd-ucode/LIC* $2/amd_ucode.LICENSE
|
||||
cp $1/usr/share/licenses/intel-ucode/LIC* $2/intel_ucode.LICENSE
|
||||
cp $1/usr/share/licenses/amd-ucode/LICENSE $2/amd_ucode.LICENSE
|
||||
cp $1/usr/share/licenses/intel-ucode/LICENSE $2/intel_ucode.LICENSE
|
||||
cp $1/boot/memtest86+/memtest.bin $2/memtest
|
||||
cp $1/usr/share/licenses/common/GPL2/license.txt $2/memtest.COPYING
|
||||
}
|
||||
|
||||
prepare_grub(){
|
||||
|
|
|
|||
|
|
@ -33,11 +33,6 @@ add_svc_sd(){
|
|||
msg2 "Setting %s ..." "$2"
|
||||
chroot $1 systemctl enable $2 &>/dev/null
|
||||
fi
|
||||
if [[ -f $1/etc/systemd/system/$2 ]] || \
|
||||
[[ -f $1/usr/lib/systemd/system/$2 ]]; then
|
||||
msg2 "Setting %s ..." "$2"
|
||||
chroot $1 systemctl enable $2 &>/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
set_xdm(){
|
||||
|
|
@ -51,6 +46,19 @@ configure_mhwd_drivers(){
|
|||
local path=$1${mhwd_repo}/ \
|
||||
drv_path=$1/var/lib/mhwd/db/pci/graphic_drivers
|
||||
info "Configuring mhwd db ..."
|
||||
if [ -z "$(ls $path | grep catalyst-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Catalyst driver"
|
||||
mkdir -p $drv_path/catalyst/
|
||||
echo "" > $drv_path/catalyst/MHWDCONFIG
|
||||
fi
|
||||
if [ -z "$(ls $path | grep nvidia-340xx-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Nvidia 340xx driver"
|
||||
mkdir -p $drv_path/nvidia-340xx/
|
||||
echo "" > $drv_path/nvidia-340xx/MHWDCONFIG
|
||||
msg2 "Disabling Nvidia 340xx Bumblebee driver"
|
||||
mkdir -p $drv_path/hybrid-intel-nvidia-340xx-bumblebee/
|
||||
echo "" > $drv_path/hybrid-intel-nvidia-340xx-bumblebee/MHWDCONFIG
|
||||
fi
|
||||
if [ -z "$(ls $path | grep nvidia-390xx-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Nvidia 390xx driver"
|
||||
mkdir -p $drv_path/nvidia-390xx/
|
||||
|
|
@ -59,27 +67,47 @@ configure_mhwd_drivers(){
|
|||
mkdir -p $drv_path/hybrid-intel-nvidia-390xx-bumblebee/
|
||||
echo "" > $drv_path/hybrid-intel-nvidia-390xx-bumblebee/MHWDCONFIG
|
||||
fi
|
||||
if [ -z "$(ls $path | grep nvidia-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Nvidia driver"
|
||||
mkdir -p $drv_path/nvidia/
|
||||
echo "" > $drv_path/nvidia/MHWDCONFIG
|
||||
msg2 "Disabling Nvidia AMD Prime driver"
|
||||
mkdir -p $drv_path/hybrid-amd-nvidia-prime/
|
||||
echo "" > $drv_path/hybrid-amd-nvidia-prime/MHWDCONFIG
|
||||
msg2 "Disabling Nvidia Intel Prime driver"
|
||||
mkdir -p $drv_path/hybrid-intel-nvidia-prime/
|
||||
echo "" > $drv_path/hybrid-intel-nvidia-prime/MHWDCONFIG
|
||||
if [ -z "$(ls $path | grep nvidia-418xx-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Nvidia 418xx driver"
|
||||
mkdir -p $drv_path/nvidia-418xx/
|
||||
echo "" > $drv_path/nvidia-418xx/MHWDCONFIG
|
||||
msg2 "Disabling Nvidia 418xx Bumblebee driver"
|
||||
mkdir -p $drv_path/hybrid-intel-nvidia-418xx-bumblebee/
|
||||
echo "" > $drv_path/hybrid-intel-nvidia-418xx-bumblebee/MHWDCONFIG
|
||||
fi
|
||||
if [ -z "$(ls $path | grep nvidia-470xx-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Nvidia 470xx driver"
|
||||
mkdir -p $drv_path/nvidia-470xx/
|
||||
echo "" > $drv_path/nvidia-470xx/MHWDCONFIG
|
||||
msg2 "Disabling Nvidia 470xx AMD Prime driver"
|
||||
mkdir -p $drv_path/hybrid-amd-nvidia-470xx-prime/
|
||||
echo "" > $drv_path/hybrid-amd-nvidia-470xx-prime/MHWDCONFIG
|
||||
msg2 "Disabling Nvidia 470xx Intel Prime driver"
|
||||
mkdir -p $drv_path/hybrid-intel-nvidia-470xx-prime/
|
||||
echo "" > $drv_path/hybrid-intel-nvidia-470xx-prime/MHWDCONFIG
|
||||
if [ -z "$(ls $path | grep nvidia-430xx-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Nvidia 430xx driver"
|
||||
mkdir -p $drv_path/nvidia-430xx/
|
||||
echo "" > $drv_path/nvidia-430xx/MHWDCONFIG
|
||||
msg2 "Disabling Nvidia 430xx Bumblebee driver"
|
||||
mkdir -p $drv_path/hybrid-intel-nvidia-430xx-bumblebee/
|
||||
echo "" > $drv_path/hybrid-intel-nvidia-430xx-bumblebee/MHWDCONFIG
|
||||
fi
|
||||
if [ -z "$(ls $path | grep nvidia-435xx-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Nvidia 435xx driver"
|
||||
mkdir -p $drv_path/nvidia-435xx/
|
||||
echo "" > $drv_path/nvidia-435xx/MHWDCONFIG
|
||||
msg2 "Disabling Nvidia 435xx Prime driver"
|
||||
mkdir -p $drv_path/hybrid-intel-nvidia-435xx-prime/
|
||||
echo "" > $drv_path/hybrid-intel-nvidia-435xx-prime/MHWDCONFIG
|
||||
fi
|
||||
if [ -z "$(ls $path | grep nvidia-440xx-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Nvidia 440xx driver"
|
||||
mkdir -p $drv_path/nvidia-440xx/
|
||||
echo "" > $drv_path/nvidia-440xx/MHWDCONFIG
|
||||
msg2 "Disabling Nvidia 440xx Prime driver"
|
||||
mkdir -p $drv_path/hybrid-intel-nvidia-440xx-prime/
|
||||
echo "" > $drv_path/hybrid-intel-nvidia-440xx-prime/MHWDCONFIG
|
||||
fi
|
||||
if [ -z "$(ls $path | grep xf86-video-amdgpu 2> /dev/null)" ]; then
|
||||
msg2 "Disabling AMD gpu driver"
|
||||
mkdir -p $drv_path/xf86-video-amdgpu/
|
||||
echo "" > $drv_path/xf86-video-amdgpu/MHWDCONFIG
|
||||
fi
|
||||
if [ -z "$(ls $path | grep virtualbox-guest-modules 2> /dev/null)" ]; then
|
||||
msg2 "Disabling VirtualBox guest driver"
|
||||
mkdir -p $drv_path/virtualbox/
|
||||
echo "" > $drv_path/virtualbox/MHWDCONFIG
|
||||
fi
|
||||
local drv_path=$1/var/lib/mhwd/db/pci/network_drivers
|
||||
if [ -z "$(ls $path | grep broadcom-wl 2> /dev/null)" ]; then
|
||||
|
|
@ -102,12 +130,12 @@ configure_mhwd_drivers(){
|
|||
configure_lsb(){
|
||||
if [ -e $1/etc/lsb-release ] ; then
|
||||
msg2 "Configuring lsb-release"
|
||||
sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=\"${dist_release}\"/" $1/etc/lsb-release
|
||||
sed -i -e "s/^.*DISTRIB_CODENAME.*/DISTRIB_CODENAME=\"${dist_codename}\"/" $1/etc/lsb-release
|
||||
sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=${dist_release}/" $1/etc/lsb-release
|
||||
sed -i -e "s/^.*DISTRIB_CODENAME.*/DISTRIB_CODENAME=${dist_codename}/" $1/etc/lsb-release
|
||||
fi
|
||||
}
|
||||
|
||||
configure_branding_old(){
|
||||
configure_branding(){
|
||||
msg2 "Configuring branding"
|
||||
echo "---
|
||||
componentName: manjaro
|
||||
|
|
@ -189,17 +217,6 @@ images:
|
|||
# installer is actually writing to disk and doing other slow things).
|
||||
slideshow: "show.qml"
|
||||
|
||||
# There are two available APIs for the slideshow:
|
||||
# - 1 (the default) loads the entire slideshow when the installation-
|
||||
# slideshow page is shown and starts the QML then. The QML
|
||||
# is never stopped (after installation is done, times etc.
|
||||
# continue to fire).
|
||||
# - 2 loads the slideshow on startup and calls onActivate() and
|
||||
# onLeave() in the root object. After the installation is done,
|
||||
# the show is stopped (first by calling onLeave(), then destroying
|
||||
# the QML components).
|
||||
slideshowAPI: 1
|
||||
|
||||
# Colors for text and background components.
|
||||
#
|
||||
# - sidebarBackground is the background of the sidebar
|
||||
|
|
@ -215,261 +232,6 @@ style:
|
|||
sidebarTextHighlight: "\"${sidebartexthighlight}"\"" > $1/usr/share/calamares/branding/manjaro/branding.desc
|
||||
}
|
||||
|
||||
configure_branding(){
|
||||
msg2 "Configuring branding"
|
||||
echo "# SPDX-FileCopyrightText: no
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
#
|
||||
# Product branding information. This influences some global
|
||||
# user-visible aspects of Calamares, such as the product
|
||||
# name, window behavior, and the slideshow during installation.
|
||||
#
|
||||
# Additional styling can be done using the stylesheet.qss
|
||||
# file, also in the branding directory.
|
||||
---
|
||||
componentName: manjaro
|
||||
|
||||
|
||||
### WELCOME / OVERALL WORDING
|
||||
#
|
||||
# These settings affect some overall phrasing and looks,
|
||||
# which are most visible in the welcome page.
|
||||
|
||||
# This selects between different welcome texts. When false, uses
|
||||
# the traditional "Welcome to the %1 installer.", and when true,
|
||||
# uses "Welcome to the Calamares installer for %1." This allows
|
||||
# to distinguish this installer from other installers for the
|
||||
# same distribution.
|
||||
welcomeStyleCalamares: ${welcomestyle}
|
||||
|
||||
# Should the welcome image (productWelcome, below) be scaled
|
||||
# up beyond its natural size? If false, the image does not grow
|
||||
# with the window but remains the same size throughout (this
|
||||
# may have surprising effects on HiDPI monitors).
|
||||
welcomeExpandingLogo: ${welcomelogo}
|
||||
|
||||
### WINDOW CONFIGURATION
|
||||
#
|
||||
# The settings here affect the placement of the Calamares
|
||||
# window through hints to the window manager and initial
|
||||
# sizing of the Calamares window.
|
||||
|
||||
# Size and expansion policy for Calamares.
|
||||
# - "normal" or unset, expand as needed, use *windowSize*
|
||||
# - "fullscreen", start as large as possible, ignore *windowSize*
|
||||
# - "noexpand", don't expand automatically, use *windowSize*
|
||||
windowExpanding: ${windowexp}
|
||||
|
||||
# Size of Calamares window, expressed as w,h. Both w and h
|
||||
# may be either pixels (suffix px) or font-units (suffix em).
|
||||
# e.g. "800px,600px"
|
||||
# "60em,480px"
|
||||
# This setting is ignored if "fullscreen" is selected for
|
||||
# *windowExpanding*, above. If not set, use constants defined
|
||||
# in CalamaresUtilsGui, 800x520.
|
||||
windowSize: ${windowsize}
|
||||
|
||||
# Placement of Calamares window. Either "center" or "free".
|
||||
# Whether "center" actually works does depend on the window
|
||||
# manager in use (and only makes sense if you're not using
|
||||
# *windowExpanding* set to "fullscreen").
|
||||
windowPlacement: ${windowplacement}
|
||||
|
||||
### PANELS CONFIGURATION
|
||||
#
|
||||
# Calamares has a main content area, and two panels (navigation
|
||||
# and progress / sidebar). The panels can be controlled individually,
|
||||
# or switched off. If both panels are switched off, the layout of
|
||||
# the main content area loses its margins, on the assumption that
|
||||
# you're doing something special.
|
||||
|
||||
# Kind of sidebar (panel on the left, showing progress).
|
||||
# - "widget" or unset, use traditional sidebar (logo, items)
|
||||
# - "none", hide it entirely
|
||||
# - "qml", use calamares-sidebar.qml from branding folder
|
||||
# In addition, you **may** specify a side, separated by a comma,
|
||||
# from the kind. Valid sides are:
|
||||
# - "left" (if not specified, uses this)
|
||||
# - "right"
|
||||
# - "top"
|
||||
# - "bottom"
|
||||
# For instance, "widget,right" is valid; so is "qml", which defaults
|
||||
# to putting the sidebar on the left. Also valid is "qml,top".
|
||||
# While "widget,top" is valid, the widgets code is **not** flexible
|
||||
# and results will be terrible.
|
||||
sidebar: qml
|
||||
|
||||
# Kind of navigation (button panel on the bottom).
|
||||
# - "widget" or unset, use traditional navigation
|
||||
# - "none", hide it entirely
|
||||
# - "qml", use calamares-navigation.qml from branding folder
|
||||
# In addition, you **may** specify a side, separated by a comma,
|
||||
# from the kind. The same sides are valid as for *sidebar*,
|
||||
# except the default is *bottom*.
|
||||
navigation: widget
|
||||
|
||||
|
||||
### STRINGS, IMAGES AND COLORS
|
||||
#
|
||||
# This section contains the "branding proper" of names
|
||||
# and images, rather than global-look settings.
|
||||
|
||||
# These are strings shown to the user in the user interface.
|
||||
# There is no provision for translating them -- since they
|
||||
# are names, the string is included as-is.
|
||||
#
|
||||
# The four Url strings are the Urls used by the buttons in
|
||||
# the welcome screen, and are not shown to the user. Clicking
|
||||
# on the "Support" button, for instance, opens the link supportUrl.
|
||||
# If a Url is empty, the corresponding button is not shown.
|
||||
#
|
||||
# bootloaderEntryName is how this installation / distro is named
|
||||
# in the boot loader (e.g. in the GRUB menu).
|
||||
#
|
||||
# These strings support substitution from /etc/os-release
|
||||
# if KDE Frameworks 5.58 are available at build-time. When
|
||||
# enabled, @{var-name} is replaced by the equivalent value
|
||||
# from os-release. All the supported var-names are in all-caps,
|
||||
# and are listed on the FreeDesktop.org site,
|
||||
# https://www.freedesktop.org/software/systemd/man/os-release.html
|
||||
# Note that ANSI_COLOR and CPE_NAME don't make sense here, and
|
||||
# are not supported (the rest are). Remember to quote the string
|
||||
# if it contains substitutions, or you'll get YAML exceptions.
|
||||
#
|
||||
# The *Url* entries are used on the welcome page, and they
|
||||
# are visible as buttons there if the corresponding *show* keys
|
||||
# are set to "true" (they can also be overridden).
|
||||
strings:
|
||||
productName: ${dist_name} Linux
|
||||
shortProductName: ${dist_name}
|
||||
version: ${dist_release}
|
||||
shortVersion: ${dist_release}
|
||||
versionedName: ${dist_name} Linux ${dist_release} "\"${dist_codename}"\"
|
||||
shortVersionedName: ${dist_name} ${dist_release}
|
||||
bootloaderEntryName: ${dist_name}
|
||||
|
||||
|
||||
# These images are loaded from the branding module directory.
|
||||
#
|
||||
# productBanner is an optional image, which if present, will be shown
|
||||
# on the welcome page of the application, above the welcome text.
|
||||
# It is intended to have a width much greater than height.
|
||||
# It is displayed at 64px height (also on HiDPI).
|
||||
# Recommended size is 64px tall, and up to 460px wide.
|
||||
# productIcon is used as the window icon, and will (usually) be used
|
||||
# by the window manager to represent the application. This image
|
||||
# should be square, and may be displayed by the window manager
|
||||
# as small as 16x16 (but possibly larger).
|
||||
# productLogo is used as the logo at the top of the left-hand column
|
||||
# which shows the steps to be taken. The image should be square,
|
||||
# and is displayed at 80x80 pixels (also on HiDPI).
|
||||
# productWallpaper is an optional image, which if present, will replace
|
||||
# the normal solid background on every page of the application.
|
||||
# It can be any size and proportion,
|
||||
# and will be tiled to fit the entire window.
|
||||
# For a non-tiled wallpaper, the size should be the same as
|
||||
# the overall window, see *windowSize* above (800x520).
|
||||
# productWelcome is shown on the welcome page of the application in
|
||||
# the middle of the window, below the welcome text. It can be
|
||||
# any size and proportion, and will be scaled to fit inside
|
||||
# the window. Use 'welcomeExpandingLogo' to make it non-scaled.
|
||||
# Recommended size is 320x150.
|
||||
#
|
||||
# These filenames can also use substitutions from os-release (see above).
|
||||
images:
|
||||
# productBanner: "banner.png"
|
||||
productIcon: "logo_small.svg"
|
||||
productLogo: "logo.svg"
|
||||
# productWallpaper: "wallpaper.png"
|
||||
productWelcome: "welcome/mascot.svg"
|
||||
|
||||
# Colors for text and background components.
|
||||
#
|
||||
# - SidebarBackground is the background of the sidebar
|
||||
# - SidebarText is the (foreground) text color
|
||||
# - SidebarBackgroundCurrent sets the background of the current step.
|
||||
# Optional, and defaults to the application palette.
|
||||
# - SidebarTextCurrent is the text color of the current step.
|
||||
#
|
||||
# These colors can **also** be set through the stylesheet, if the
|
||||
# branding component also ships a stylesheet.qss. Then they are
|
||||
# the corresponding CSS attributes of #sidebarApp.
|
||||
style:
|
||||
sidebarBackground: "\"${sidebarbackground}"\"
|
||||
sidebarText: "\"${sidebartext}"\"
|
||||
sidebarTextSelect: "\"${sidebartextselect}"\"
|
||||
sidebarTextHighlight: "\"${sidebartexthighlight}"\"
|
||||
SidebarBackground: "\"${sidebarbackground}"\"
|
||||
SidebarText: "\"${sidebartext}"\"
|
||||
SidebarTextSelect: "\"${sidebartextselect}"\"
|
||||
SidebarBackgroundCurrent: "\"${sidebartexthighlight}"\"
|
||||
|
||||
### SLIDESHOW
|
||||
#
|
||||
# The slideshow is displayed during execution steps (e.g. when the
|
||||
# installer is actually writing to disk and doing other slow things).
|
||||
|
||||
# The slideshow can be a QML file (recommended) which can display
|
||||
# arbitrary things -- text, images, animations, or even play a game --
|
||||
# during the execution step. The QML **is** abruptly stopped when the
|
||||
# execution step is done, though, so maybe a game isn't a great idea.
|
||||
#
|
||||
# The slideshow can also be a sequence of images (not recommended unless
|
||||
# you don't want QML at all in your Calamares). The images are displayed
|
||||
# at a rate of 1 every 2 seconds during the execution step.
|
||||
#
|
||||
# To configure a QML file, list a single filename:
|
||||
# slideshow: "show.qml"
|
||||
# To configure images, like the filenames (here, as an inline list):
|
||||
# slideshow: [ "/etc/calamares/slideshow/0.png", "/etc/logo.png" ]
|
||||
slideshow: "slideshow/SlideShow.qml"
|
||||
|
||||
# There are two available APIs for a QML slideshow:
|
||||
# - 1 (the default) loads the entire slideshow when the installation-
|
||||
# slideshow page is shown and starts the QML then. The QML
|
||||
# is never stopped (after installation is done, times etc.
|
||||
# continue to fire).
|
||||
# - 2 loads the slideshow on startup and calls onActivate() and
|
||||
# onLeave() in the root object. After the installation is done,
|
||||
# the show is stopped (first by calling onLeave(), then destroying
|
||||
# the QML components).
|
||||
#
|
||||
# An image slideshow does not need to have the API defined.
|
||||
slideshowAPI: 2
|
||||
|
||||
|
||||
# These options are to customize online uploading of logs to pastebins:
|
||||
# - type : Defines the kind of pastebin service to be used. Currently
|
||||
# it accepts two values:
|
||||
# - none : disables the pastebin functionality
|
||||
# - fiche : use fiche pastebin server
|
||||
# - url : Defines the address of pastebin service to be used.
|
||||
# Takes string as input. Important bits are the host and port,
|
||||
# the scheme is not used.
|
||||
# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted.
|
||||
# The option must be set, to have the log option work.
|
||||
# Takes integer as input. If < 0, no limit will be forced,
|
||||
# else only last (approximately) 'n' KiB of log file will be pasted.
|
||||
# Please note that upload size may be slightly over the limit (due
|
||||
# to last minute logging), so provide a suitable value.
|
||||
uploadServer :
|
||||
type : "fiche"
|
||||
url : "http://termbin.com:9999"
|
||||
sizeLimit : -1" > $1/usr/share/calamares/branding/manjaro/branding.desc
|
||||
}
|
||||
|
||||
configure_polkit_user_rules(){
|
||||
msg2 "Configuring polkit user rules"
|
||||
echo "/* Stop asking the user for a password while they are in a live session
|
||||
*/
|
||||
polkit.addRule(function(action, subject) {
|
||||
if (subject.user == \"${username}\")
|
||||
{
|
||||
return polkit.Result.YES;
|
||||
}
|
||||
});" > $1/etc/polkit-1/rules.d/49-nopasswd-live.rules
|
||||
}
|
||||
|
||||
configure_logind(){
|
||||
msg2 "Configuring logind ..."
|
||||
local conf=$1/etc/systemd/logind.conf
|
||||
|
|
@ -484,20 +246,14 @@ configure_journald(){
|
|||
sed -i 's/#\(Storage=\)auto/\1volatile/' "$conf"
|
||||
}
|
||||
|
||||
disable_srv_live(){
|
||||
for srv in ${disable_systemd_live[@]}; do
|
||||
enable_systemd_live=(${enable_systemd_live[@]//*$srv*})
|
||||
done
|
||||
}
|
||||
|
||||
configure_services(){
|
||||
info "Configuring services"
|
||||
use_apparmor="false"
|
||||
apparmor_boot_args=""
|
||||
enable_systemd_live=(${enable_systemd_live[@]} ${enable_systemd[@]})
|
||||
|
||||
[[ ! -z $disable_systemd_live ]] && disable_srv_live
|
||||
|
||||
for svc in ${enable_systemd[@]}; do
|
||||
add_svc_sd "$1" "$svc"
|
||||
[[ "$svc" == "apparmor" ]] && use_apparmor="true"
|
||||
done
|
||||
for svc in ${enable_systemd_live[@]}; do
|
||||
add_svc_sd "$1" "$svc"
|
||||
[[ "$svc" == "apparmor" ]] && use_apparmor="true"
|
||||
|
|
|
|||
|
|
@ -59,29 +59,11 @@ mount_fs_net(){
|
|||
track_fs -t overlay overlay -olowerdir="${work_dir}/livefs":"${work_dir}/rootfs",upperdir="$1",workdir="${mnt_dir}/work" "$1"
|
||||
}
|
||||
|
||||
check_umount() {
|
||||
if mountpoint -q "$1"
|
||||
then
|
||||
umount -l "$1"
|
||||
fi
|
||||
}
|
||||
|
||||
umount_fs(){
|
||||
if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]]; then
|
||||
info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
|
||||
#umount "${FS_ACTIVE_MOUNTS[@]}"
|
||||
for i in "${FS_ACTIVE_MOUNTS[@]}"
|
||||
do
|
||||
info "umount overlayfs: [%s]" "$i"
|
||||
check_umount $i
|
||||
done
|
||||
umount "${FS_ACTIVE_MOUNTS[@]}"
|
||||
unset FS_ACTIVE_MOUNTS
|
||||
rm -rf "${mnt_dir}/work"
|
||||
fi
|
||||
mount_folders=$(grep "${work_dir}" /proc/mounts | awk '{print$2}' | sort -r)
|
||||
for i in $mount_folders
|
||||
do
|
||||
info "umount folder: [%s]" "$i"
|
||||
check_umount $i
|
||||
done
|
||||
}
|
||||
|
|
|
|||
|
|
@ -187,7 +187,8 @@ assemble_iso(){
|
|||
-e --interval:appended_partition_2:all:: \
|
||||
-no-emul-boot \
|
||||
-full-iso9660-filenames \
|
||||
-iso-level 3 -rock -joliet \
|
||||
-iso-level 3 \
|
||||
-J \
|
||||
-o ${iso_dir}/${iso_file} \
|
||||
${iso_root}/
|
||||
}
|
||||
|
|
@ -198,10 +199,6 @@ make_iso() {
|
|||
touch "${iso_root}/.miso"
|
||||
for sfs_dir in $(find "${work_dir}" -maxdepth 1 -type d); do
|
||||
if [[ "${sfs_dir}" != "${work_dir}" ]]; then
|
||||
if [[ -e "${sfs_dir}"/etc/pacman.d/gnupg ]]; then
|
||||
msg2 "Removing '/etc/pacman.d/gnupg' folder from ${sfs_dir}"
|
||||
rm -rf "${sfs_dir}"/etc/pacman.d/gnupg
|
||||
fi
|
||||
make_sfs "${sfs_dir}"
|
||||
fi
|
||||
done
|
||||
|
|
@ -219,38 +216,31 @@ make_iso() {
|
|||
fi
|
||||
assemble_iso
|
||||
|
||||
${permalink} && gen_permalink
|
||||
[[ ${target_branch} == "stable" ]] && [[ ${extra} == "true" ]] && gen_latest_html
|
||||
|
||||
msg "Done [Build ISO]"
|
||||
}
|
||||
|
||||
gen_permalink(){
|
||||
gen_latest_html(){
|
||||
if [[ ${edition} == "community" ]] || [[ ${edition} == "manjaro" ]]; then
|
||||
if [[ -f "${iso_dir}/${iso_file}" ]]; then
|
||||
msg2 "Creating download link ..."
|
||||
if [[ -f "${iso_dir}/${iso_file}" ]]; then
|
||||
msg2 "Creating download link ..."
|
||||
direct_url="https://osdn.net/dl/${edition}/${iso_file}"
|
||||
[[ ${edition} == "community" ]] && direct_url="https://osdn.net/dl/manjaro-${edition}/${iso_file}"
|
||||
## html permalink
|
||||
html_doc="<!DOCTYPE HTML>"
|
||||
html_doc+="<meta charset=\"UTF-8\">"
|
||||
html_doc+="<meta http-equiv=\"refresh\" content=\"1; url=${direct_url}\">"
|
||||
html_doc+="<script>window.location.href=\"${direct_url}\"</script>"
|
||||
html_doc+="<title>Download Redirection</title>"
|
||||
html_doc+="If you are not redirected automatically, follow the <a href=\"${direct_url}\">link to latest iso</a>"
|
||||
## php permalink
|
||||
[[ ${edition} == "community" ]] && direct_url="https://osdn.net/dl/manjaro-${edition}/${iso_file}"
|
||||
html_doc="<!DOCTYPE HTML>"
|
||||
html_doc+="<meta charset=\"UTF-8\">"
|
||||
html_doc+="<meta http-equiv=\"refresh\" content=\"1; url=${direct_url}\">"
|
||||
html_doc+="<script>window.location.href=\"${direct_url}\"</script>"
|
||||
html_doc+="<title>Download Redirection</title>"
|
||||
html_doc+="If you are not redirected automatically, follow the <a href=\"${direct_url}\">link to latest iso</a>"
|
||||
echo ${html_doc} > "${iso_dir}/.latest"
|
||||
|
||||
php_doc="<?php "
|
||||
php_doc+="header('Location: ' . '${direct_url}', true, 303); "
|
||||
php_doc+="die(); "
|
||||
php_doc+="?>"
|
||||
## write files
|
||||
if [[ ${extra} == "true" ]]; then
|
||||
echo ${html_doc} > "${iso_dir}/.latest"
|
||||
echo ${php_doc} > "${iso_dir}/.latest.php"
|
||||
else
|
||||
echo ${html_doc} > "${iso_dir}/.latest-minimal"
|
||||
echo ${php_doc} > "${iso_dir}/.latest-minimal.php"
|
||||
fi
|
||||
fi
|
||||
echo ${php_doc} > "${iso_dir}/.latest.php"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -358,20 +348,14 @@ make_image_desktop() {
|
|||
cp "${path}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt
|
||||
[[ -e ${profile_dir}/desktop-overlay ]] && copy_overlay "${profile_dir}/desktop-overlay" "${path}"
|
||||
|
||||
if [[ -e "${path}/usr/share/calamares/branding/manjaro/calamares-sidebar.qml" ]]; then
|
||||
if [[ ${profile} != "architect" && ${oem_used} != "false" ]]; then
|
||||
configure_branding "${path}"
|
||||
msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]"
|
||||
elif [[ -e "${path}/usr/share/calamares/branding/manjaro/show.qml" ]]; then
|
||||
configure_branding_old "${path}"
|
||||
msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]"
|
||||
fi
|
||||
|
||||
reset_pac_conf "${path}"
|
||||
|
||||
seed_snaps ${path}
|
||||
|
||||
echo "Enable os-prober"
|
||||
sed -i -e 's,.*GRUB_DISABLE_OS_PROBER=.*,GRUB_DISABLE_OS_PROBER=false,' "${path}/etc/default/grub"
|
||||
|
||||
umount_fs
|
||||
clean_up_image "${path}"
|
||||
|
|
@ -402,27 +386,17 @@ make_image_live() {
|
|||
copy_overlay "${profile_dir}/live-overlay" "${path}"
|
||||
configure_live_image "${path}"
|
||||
|
||||
# mask some systemd targets on live-session
|
||||
mkdir -p "${path}"/etc/systemd/system
|
||||
ln -sfv /dev/null "${path}"/etc/systemd/system/sleep.target
|
||||
ln -sfv /dev/null "${path}"/etc/systemd/system/suspend.target
|
||||
ln -sfv /dev/null "${path}"/etc/systemd/system/hibernate.target
|
||||
ln -sfv /dev/null "${path}"/etc/systemd/system/hybrid-sleep.target
|
||||
|
||||
if [[ -e "${path}/usr/share/calamares/branding/manjaro/calamares-sidebar.qml" ]]; then
|
||||
if [[ ${profile} != "architect" ]]; then
|
||||
configure_branding "${path}"
|
||||
msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]"
|
||||
elif [[ -e "${path}/usr/share/calamares/branding/manjaro/show.qml" ]]; then
|
||||
configure_branding_old "${path}"
|
||||
msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]"
|
||||
fi
|
||||
|
||||
configure_polkit_user_rules "${path}"
|
||||
|
||||
reset_pac_conf "${path}"
|
||||
|
||||
umount_fs
|
||||
|
||||
# Clean up GnuPG keys
|
||||
rm -rf "${path}/etc/pacman.d/gnupg"
|
||||
clean_up_image "${path}"
|
||||
: > ${work_dir}/build.${FUNCNAME}
|
||||
msg "Done [Live installation] (livefs)"
|
||||
|
|
@ -639,8 +613,7 @@ load_profile(){
|
|||
|
||||
iso_file=$(gen_iso_fn).iso
|
||||
|
||||
[[ ${extra} == 'false' ]] && _edition=("m")
|
||||
iso_label=$(get_iso_label "${dist_branding}_${profile}${_edition}_${dist_release//.}")
|
||||
iso_label=$(get_iso_label "${dist_branding}_${profile}_${dist_release//.}")
|
||||
|
||||
mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}" -K)
|
||||
work_dir=${chroots_iso}/${profile}/${target_arch}
|
||||
|
|
|
|||
|
|
@ -45,31 +45,33 @@ chroot_part_mount() {
|
|||
}
|
||||
|
||||
select_os(){
|
||||
local detected_os_list=( $(detect) ) os_list=() count select os_str os_root
|
||||
for os in ${detected_os_list[@]}; do
|
||||
case ${os##*:} in
|
||||
'linux') os_list+=($os)
|
||||
esac
|
||||
done
|
||||
count=${#os_list[@]}
|
||||
if [[ ${count} < 1 ]]; then
|
||||
die "No Linux partitions detected!"
|
||||
fi
|
||||
local os_list=( $(detect) ) count=${#os_list[@]}
|
||||
if [[ ${count} > 1 ]]; then
|
||||
msg "Detected systems:"
|
||||
local i=0
|
||||
for os in ${os_list[@]}; do
|
||||
info "$i) $(get_os_name $os)"; i=$((i+1))
|
||||
done
|
||||
msg "Detected systems:"
|
||||
local i=0
|
||||
for os in ${os_list[@]}; do
|
||||
local last=${os##*:}
|
||||
case $last in
|
||||
'efi') count=$((count-1)) ;;
|
||||
*) info "$i) $(get_os_name $os)"; i=$((i+1)) ;;
|
||||
esac
|
||||
done
|
||||
i=0
|
||||
msg "Select system to mount [0-%s] : " "$((count-1))"
|
||||
read select
|
||||
else
|
||||
read select
|
||||
else
|
||||
select=0
|
||||
fi
|
||||
os_str=${os_list[$select]}
|
||||
os_root=${os_str%%:*}
|
||||
msg "Mounting (%s) [%s]" "$(get_os_name $os_str)" "$os_root"
|
||||
chroot_mount_partitions "$1" "$os_root"
|
||||
local os_str=${os_list[$select]} type
|
||||
type=$os_str
|
||||
root=${os_str%%:*}
|
||||
type=${type##*:}
|
||||
if [[ "${type##*:}" == 'linux' ]]; then
|
||||
msg "Mounting (%s) [%s]" "$(get_os_name $os_str)" "$root"
|
||||
chroot_mount_partitions "$1" "$root"
|
||||
else
|
||||
die "You can't mount %s!" "$select"
|
||||
fi
|
||||
}
|
||||
|
||||
chroot_mount_partitions(){
|
||||
|
|
|
|||
|
|
@ -9,25 +9,22 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
local MINIMAL
|
||||
|
||||
connect(){
|
||||
${alt_storage} && server="storage-in" || server="storage"
|
||||
local storage="@${server}.osdn.net:/storage/groups/m/ma/"
|
||||
echo "${account}${storage}${project}"
|
||||
}
|
||||
|
||||
connect_shell(){
|
||||
local shell="@shell.osdn.net:/home/groups/m/ma/"
|
||||
echo "${account}${shell}${project}"
|
||||
connect_webserver(){
|
||||
local webserver="@shell.osdn.net:/home/groups/m/ma/"
|
||||
echo "${account}${webserver}${project}"
|
||||
}
|
||||
|
||||
make_torrent(){
|
||||
find ${src_dir} -type f -name "*.torrent" -delete
|
||||
|
||||
if [[ -n $(find ${src_dir} -type f -name "*.iso") ]]; then
|
||||
isos=$(ls ${src_dir}/*.iso)
|
||||
for iso in ${isos}; do
|
||||
for iso in $(ls ${src_dir}/*.iso); do
|
||||
local seed=https://${host}/dl/${project}/${iso##*/}
|
||||
local mktorrent_args=(-c "${torrent_meta}" -p -l ${piece_size} -a ${tracker_url} -w ${seed})
|
||||
${verbose} && mktorrent_args+=(-v)
|
||||
|
|
@ -44,9 +41,6 @@ prepare_transfer(){
|
|||
[[ -z ${project} ]] && project="$(get_project)"
|
||||
server=$(connect)
|
||||
|
||||
webshell=$(connect_shell)
|
||||
htdocs="htdocs/${profile}"
|
||||
|
||||
target_dir="${profile}/${dist_release}"
|
||||
src_dir="${run_dir}/${edition}/${target_dir}"
|
||||
|
||||
|
|
@ -86,17 +80,15 @@ sync_dir(){
|
|||
msg "Start upload [%s] to [%s] ..." "$1" "${project}"
|
||||
|
||||
while [[ $count -le $max_count ]]; do
|
||||
rsync ${rsync_args[*]} --exclude '.latest*' --exclude 'index.html' --exclude 'links.txt' ${src_dir}/ ${server}/${target_dir}/
|
||||
rsync ${rsync_args[*]} --exclude '.latest*' ${src_dir}/ ${server}/${target_dir}/
|
||||
if [[ $? != 0 ]]; then
|
||||
count=$(($count + 1))
|
||||
msg "Upload failed. retrying (%s/%s) ..." "$count" "$max_count"
|
||||
sleep 2
|
||||
else
|
||||
count=$(($max_count + 1))
|
||||
|
||||
${upd_homepage} && pull_hp_repo
|
||||
${shell_upload} && upload_permalinks
|
||||
|
||||
[[ -f "${src_dir}/.latest" ]] && sync_latest_html
|
||||
[[ -f "${src_dir}/.latest.php" ]] && sync_latest_php
|
||||
msg "Done upload [%s]" "$1"
|
||||
show_elapsed_time "${FUNCNAME}" "${timer_start}"
|
||||
fi
|
||||
|
|
@ -104,158 +96,20 @@ sync_dir(){
|
|||
|
||||
}
|
||||
|
||||
upload_permalinks(){
|
||||
## permalinks for full ISO
|
||||
if [[ -f "${src_dir}/.latest" ]]; then
|
||||
msg "Uploading permalinks ..."
|
||||
LATEST_ISO=$(sed -e 's/\"/\n/g' < "${src_dir}/.latest" | grep -Eo 'http.*iso$' -m1 | awk '{split($0,x,"/"); print x[6]}')
|
||||
PKGLIST="${LATEST_ISO/.iso/-pkgs.txt}"
|
||||
|
||||
## upload redirector files
|
||||
[[ -f "${src_dir}/.latest" ]] && sync_latest_html
|
||||
[[ -f "${src_dir}/.latest.php" ]] && sync_latest_php
|
||||
|
||||
## upload verification files, torrent and package list
|
||||
[[ -f "${src_dir}/${LATEST_ISO}.torrent" ]] && sync_latest_torrent
|
||||
[[ -f "${src_dir}/${LATEST_ISO}.sig" ]] && sync_latest_signature
|
||||
[[ -f "${src_dir}/${LATEST_ISO}.sha1" ]] && sync_latest_checksum_sha1
|
||||
[[ -f "${src_dir}/${LATEST_ISO}.sha256" ]] && sync_latest_checksum_sha256
|
||||
[[ -f "${src_dir}/${PKGLIST}" ]] && sync_latest_pkg_list
|
||||
|
||||
${upd_homepage} && upd_dl_checksum
|
||||
fi
|
||||
|
||||
## permalinks for minimal ISO
|
||||
if [[ -f "${src_dir}/.latest-minimal" ]]; then
|
||||
msg "Uploading permalinks (minimal) ..."
|
||||
MINIMAL="yes"
|
||||
LATEST_ISO=$(sed -e 's/\"/\n/g' < "${src_dir}/.latest-minimal" | grep -Eo 'http.*iso$' -m1 | awk '{split($0,x,"/"); print x[6]}')
|
||||
PKGLIST="${LATEST_ISO/.iso/-pkgs.txt}"
|
||||
|
||||
## upload redirector files
|
||||
[[ -f "${src_dir}/.latest-minimal" ]] && sync_latest_html
|
||||
[[ -f "${src_dir}/.latest-minimal.php" ]] && sync_latest_php
|
||||
|
||||
## upload verification files, torrent and package list
|
||||
[[ -f "${src_dir}/${LATEST_ISO}.torrent" ]] && sync_latest_torrent
|
||||
[[ -f "${src_dir}/${LATEST_ISO}.sig" ]] && sync_latest_signature
|
||||
[[ -f "${src_dir}/${LATEST_ISO}.sha1" ]] && sync_latest_checksum_sha1
|
||||
[[ -f "${src_dir}/${LATEST_ISO}.sha256" ]] && sync_latest_checksum_sha256
|
||||
[[ -f "${src_dir}/${PKGLIST}" ]] && sync_latest_pkg_list
|
||||
|
||||
${upd_homepage} && upd_dl_checksum_minimal
|
||||
fi
|
||||
|
||||
${upd_homepage} && upd_dl_version && push_hp_repo
|
||||
}
|
||||
|
||||
sync_latest_pkg_list(){
|
||||
msg2 "Uploading package list ..."
|
||||
local pkglist="latest-pkgs.txt"
|
||||
[[ ${MINIMAL} == "yes" ]] && pkglist="latest-minimal-pkgs.txt"
|
||||
chmod g+w "${src_dir}/${PKGLIST}"
|
||||
scp -p "${src_dir}/${PKGLIST}" "${webshell}/${htdocs}/${pkglist}"
|
||||
}
|
||||
|
||||
sync_latest_checksum_sha256(){
|
||||
msg2 "Uploading sha256 checksum file ..."
|
||||
local filename="${LATEST_ISO}.sha256"
|
||||
local checksum_file="latest.sha256"
|
||||
[[ ${MINIMAL} == "yes" ]] && checksum_file="latest-minimal.sha256"
|
||||
chmod g+w "${src_dir}/${filename}"
|
||||
scp -p "${src_dir}/${filename}" "${webshell}/${htdocs}/${checksum_file}"
|
||||
}
|
||||
|
||||
sync_latest_checksum_sha1(){
|
||||
msg2 "Uploading sha1 checksum file ..."
|
||||
local filename="${LATEST_ISO}.sha1"
|
||||
local checksum_file="latest.sha1"
|
||||
[[ ${MINIMAL} == "yes" ]] && checksum_file="latest-minimal.sha1"
|
||||
chmod g+w "${src_dir}/${filename}"
|
||||
scp -p "${src_dir}/${filename}" "${webshell}/${htdocs}/${checksum_file}"
|
||||
}
|
||||
|
||||
sync_latest_signature(){
|
||||
msg2 "Uploading signature file ..."
|
||||
local filename="${LATEST_ISO}.sig"
|
||||
local signature="latest.sig"
|
||||
[[ ${MINIMAL} == "yes" ]] && signature="latest-minimal.sig"
|
||||
chmod g+w "${src_dir}/${filename}"
|
||||
scp -p "${src_dir}/${filename}" "${webshell}/${htdocs}/${signature}"
|
||||
}
|
||||
|
||||
sync_latest_torrent(){
|
||||
msg2 "Uploading torrent file ..."
|
||||
local filename="${LATEST_ISO}.torrent"
|
||||
local torrent="latest.torrent"
|
||||
[[ ${MINIMAL} == "yes" ]] && torrent="latest-minimal.torrent"
|
||||
chmod g+w "${src_dir}/${filename}"
|
||||
scp -p "${src_dir}/${filename}" "${webshell}/${htdocs}/${torrent}"
|
||||
sync_latest_html(){
|
||||
msg2 "Uploading url redirector ..."
|
||||
local webserver=$(connect_webserver)
|
||||
local htdocs="htdocs/${profile}"
|
||||
local html="latest"
|
||||
scp "${src_dir}/.${html}" "${webserver}/${htdocs}/${html}"
|
||||
rm -f "${src_dir}/.${html}"
|
||||
}
|
||||
|
||||
sync_latest_php(){
|
||||
msg2 "Uploading php redirector ..."
|
||||
local filename=".latest.php"
|
||||
local webserver=$(connect_webserver)
|
||||
local htdocs="htdocs/${profile}"
|
||||
local php="latest.php"
|
||||
[[ ${MINIMAL} == "yes" ]] && filename=".latest-minimal.php" && php="latest-minimal.php"
|
||||
chmod g+w "${src_dir}/${filename}"
|
||||
scp -p "${src_dir}/.${php}" "${webshell}/${htdocs}/${php}"
|
||||
}
|
||||
|
||||
sync_latest_html(){
|
||||
msg2 "Uploading url redirector ..."
|
||||
local filename=".latest"
|
||||
local html="latest"
|
||||
[[ ${MINIMAL} == "yes" ]] && filename=".latest-minimal" && html="latest-minimal"
|
||||
chmod g+w "${src_dir}/${filename}"
|
||||
scp -p "${src_dir}/.${html}" "${webshell}/${htdocs}/${html}"
|
||||
}
|
||||
|
||||
pull_hp_repo(){
|
||||
load_vars "$USER_HOME/.makepkg.conf" || load_vars /etc/makepkg.conf
|
||||
[[ -z $SRCDEST ]] && SRCDEST=${cache_dir}
|
||||
|
||||
hp_repo=manjaro-homepage
|
||||
[[ ${edition} == "manjaro" ]] && _edition="official" || _edition=${edition}
|
||||
dl_file="${SRCDEST}/${hp_repo}/site/content/downloads/${_edition}/${profile}.md"
|
||||
|
||||
cd "${SRCDEST}"
|
||||
if [[ ! -d "${hp_repo}" ]]; then
|
||||
msg "Cloning manjaro.org"
|
||||
git clone "ssh://git@gitlab.manjaro.org:22277/webpage/${hp_repo}.git"
|
||||
else
|
||||
cd "${hp_repo}"
|
||||
msg "Pulling manjaro.org"
|
||||
git pull
|
||||
fi
|
||||
}
|
||||
|
||||
push_hp_repo(){
|
||||
cd "${SRCDEST}/${hp_repo}"
|
||||
msg "Updating manjaro.org"
|
||||
git add ${dl_file}
|
||||
git commit -m "update download ${profile}"
|
||||
git push
|
||||
}
|
||||
|
||||
upd_dl_checksum(){
|
||||
local checksum=$(cat "${src_dir}/${LATEST_ISO}.sha1" | cut -d' ' -f1)
|
||||
msg "Updating download page:"
|
||||
msg2 "checksum > ${checksum}"
|
||||
sed -i "/Download_x64_Checksum/c\Download_x64_Checksum = \"${checksum}\"" ${dl_file}
|
||||
}
|
||||
|
||||
upd_dl_checksum_minimal(){
|
||||
local checksum=$(cat "${src_dir}/${LATEST_ISO}.sha1" | cut -d' ' -f1)
|
||||
msg "Updating download page:"
|
||||
msg2 "checksum_minimal > ${checksum}"
|
||||
sed -i "/Download_Minimal_x64_Checksum/c\Download_Minimal_x64_Checksum = \"${checksum}\"" ${dl_file}
|
||||
}
|
||||
|
||||
upd_dl_version(){
|
||||
timestamp=$(date -u +%Y-%m-%dT%T%Z)
|
||||
msg2 "Version > ${dist_release}"
|
||||
sed -i "/Version/c\Version = \"${dist_release}\"" ${dl_file}
|
||||
msg2 "date > ${timestamp}"
|
||||
sed -i "/^date/c\date = \"${timestamp}\"" ${dl_file}
|
||||
scp "${src_dir}/.${php}" "${webserver}/${htdocs}/${php}"
|
||||
rm -f "${src_dir}/.${php}"
|
||||
}
|
||||
|
|
|
|||
161
lib/util-yaml.sh
161
lib/util-yaml.sh
|
|
@ -10,7 +10,7 @@
|
|||
# GNU General Public License for more details.
|
||||
|
||||
write_machineid_conf(){
|
||||
local conf="${etc_config_dir}/machineid.conf"
|
||||
local conf="${modules_dir}/machineid.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo '---' > "$conf"
|
||||
echo "systemd: true" >> $conf
|
||||
|
|
@ -20,7 +20,7 @@ write_machineid_conf(){
|
|||
|
||||
write_finished_conf(){
|
||||
msg2 "Writing %s ..." "finished.conf"
|
||||
local conf="${etc_config_dir}/finished.conf" cmd="systemctl reboot"
|
||||
local conf="${modules_dir}/finished.conf" cmd="systemctl reboot"
|
||||
echo '---' > "$conf"
|
||||
echo 'restartNowEnabled: true' >> "$conf"
|
||||
echo 'restartNowChecked: false' >> "$conf"
|
||||
|
|
@ -42,7 +42,7 @@ get_preset(){
|
|||
}
|
||||
|
||||
write_bootloader_conf(){
|
||||
local conf="${etc_config_dir}/bootloader.conf"
|
||||
local conf="${modules_dir}/bootloader.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
source "$(get_preset)"
|
||||
echo '---' > "$conf"
|
||||
|
|
@ -63,7 +63,7 @@ write_bootloader_conf(){
|
|||
}
|
||||
|
||||
write_servicescfg_conf(){
|
||||
local conf="${etc_config_dir}/servicescfg.conf"
|
||||
local conf="${modules_dir}/servicescfg.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo '---' > "$conf"
|
||||
echo '' >> "$conf"
|
||||
|
|
@ -72,67 +72,30 @@ write_servicescfg_conf(){
|
|||
}
|
||||
|
||||
write_services_conf(){
|
||||
local conf="${etc_config_dir}/services.conf"
|
||||
local check="${modules_dir}/services.conf"
|
||||
local conf="${modules_dir}/services.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo '---' > "$conf"
|
||||
echo '' >> "$conf"
|
||||
if [ ! ${#enable_systemd[@]} -eq 0 ]; then
|
||||
if [ ! $(grep "services:" ${check} | wc -l) -eq 0 ]; then
|
||||
echo 'services:' >> "$conf"
|
||||
else
|
||||
echo 'units:' >> "$conf"
|
||||
fi
|
||||
for s in ${enable_systemd[@]}; do
|
||||
if [ ! $(grep "services:" ${check} | wc -l) -eq 0 ]; then
|
||||
echo " - name: $s" >> "$conf"
|
||||
else
|
||||
echo " - name: $s.service" >> "$conf"
|
||||
echo ' action: "enable"' >> "$conf"
|
||||
fi
|
||||
echo ' mandatory: false' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
done
|
||||
fi
|
||||
if [ ! ${#enable_systemd_timers[@]} -eq 0 ]; then
|
||||
[ ! $(grep "timers:" ${check} | wc -l) -eq 0 ] && echo 'timers:' >> "$conf"
|
||||
for s in ${enable_systemd_timers[@]}; do
|
||||
if [ ! $(grep "timers:" ${check} | wc -l) -eq 0 ]; then
|
||||
echo " - name: $s" >> "$conf"
|
||||
else
|
||||
echo " - name: $s.timer" >> "$conf"
|
||||
echo ' action: "enable"' >> "$conf"
|
||||
fi
|
||||
echo ' mandatory: false' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
done
|
||||
fi
|
||||
[ ! $(grep "targets:" ${check} | wc -l) -eq 0 ] && echo 'targets:' >> "$conf"
|
||||
if [ ! $(grep "targets:" ${check} | wc -l) -eq 0 ]; then
|
||||
echo ' - name: "graphical"' >> "$conf"
|
||||
else
|
||||
echo ' - name: "graphical.target"' >> "$conf"
|
||||
echo ' action: "set-default"' >> "$conf"
|
||||
fi
|
||||
echo 'services:' > "$conf"
|
||||
for s in ${enable_systemd[@]}; do
|
||||
echo " - name: $s" >> "$conf"
|
||||
echo ' mandatory: false' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
done
|
||||
echo 'targets:' >> "$conf"
|
||||
echo ' - name: "graphical"' >> "$conf"
|
||||
echo ' mandatory: true' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
if [ ! ${#disable_systemd[@]} -eq 0 ]; then
|
||||
[ ! $(grep "disable:" ${check} | wc -l) -eq 0 ] && echo 'disable:' >> "$conf"
|
||||
for s in ${disable_systemd[@]}; do
|
||||
if [ ! $(grep "services:" ${check} | wc -l) -eq 0 ]; then
|
||||
echo " - name: $s" >> "$conf"
|
||||
else
|
||||
echo " - name: $s.service" >> "$conf"
|
||||
echo ' action: "disable"' >> "$conf"
|
||||
fi
|
||||
echo ' mandatory: false' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
done
|
||||
fi
|
||||
echo 'disable:' >> "$conf"
|
||||
for s in ${disable_systemd[@]}; do
|
||||
echo " - name: $s" >> "$conf"
|
||||
echo ' mandatory: false' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
done
|
||||
}
|
||||
|
||||
write_displaymanager_conf(){
|
||||
local conf="${etc_config_dir}/displaymanager.conf"
|
||||
local conf="${modules_dir}/displaymanager.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "displaymanagers:" >> "$conf"
|
||||
|
|
@ -147,14 +110,14 @@ write_displaymanager_conf(){
|
|||
}
|
||||
|
||||
write_initcpio_conf(){
|
||||
local conf="${etc_config_dir}/initcpio.conf"
|
||||
local conf="${modules_dir}/initcpio.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "kernel: ${kernel}" >> "$conf"
|
||||
}
|
||||
|
||||
write_unpack_conf(){
|
||||
local conf="${etc_config_dir}/unpackfs.conf"
|
||||
local conf="${modules_dir}/unpackfs.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "unpack:" >> "$conf"
|
||||
|
|
@ -169,7 +132,7 @@ write_unpack_conf(){
|
|||
}
|
||||
|
||||
write_users_conf(){
|
||||
local conf="${etc_config_dir}/users.conf"
|
||||
local conf="${modules_dir}/users.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "defaultGroups:" >> "$conf"
|
||||
|
|
@ -181,8 +144,6 @@ write_users_conf(){
|
|||
echo "autologinGroup: autologin" >> "$conf"
|
||||
echo "doAutologin: false" >> "$conf" # can be either 'true' or 'false'
|
||||
echo "sudoersGroup: wheel" >> "$conf"
|
||||
echo "passwordRequirements:" >> "$conf"
|
||||
echo " nonempty: true" >> "$conf" # can be either 'true' or 'false'
|
||||
echo "setRootPassword: true" >> "$conf" # must be true, else some options get hidden
|
||||
echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
|
||||
echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
|
||||
|
|
@ -192,42 +153,17 @@ write_users_conf(){
|
|||
fi
|
||||
}
|
||||
|
||||
write_partition_conf(){
|
||||
local conf="${etc_config_dir}/partition.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "efiSystemPartition: \"/boot/efi\"" >> "$conf"
|
||||
echo "userSwapChoices:" >> "$conf"
|
||||
echo " - none # Create no swap, use no swap" >> "$conf"
|
||||
echo " - small # Up to 4GB" >> "$conf"
|
||||
echo " - suspend # At least main memory size" >> "$conf"
|
||||
echo " - file # To swap file instead of partition" >> "$conf"
|
||||
echo "alwaysShowPartitionLabels: true" >> "$conf"
|
||||
echo "# There are four options: erase, replace, alongside, manual)," >> "$conf"
|
||||
echo "# the default is \"none\"." >> "$conf"
|
||||
echo "initialPartitioningChoice: erase" >> "$conf"
|
||||
echo "initialSwapChoice: none" >> "$conf"
|
||||
echo "defaultFileSystemType: \"ext4\"" >> "$conf"
|
||||
echo "availableFileSystemTypes: [\"ext4\",\"btrfs\",\"f2fs\",\"xfs\"]" >> "$conf"
|
||||
}
|
||||
|
||||
write_packages_conf(){
|
||||
local conf="${etc_config_dir}/packages.conf"
|
||||
local conf="${modules_dir}/packages.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "backend: pacman" >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
if ${needs_internet}; then
|
||||
echo "skip_if_no_internet: false" >> "$conf"
|
||||
else
|
||||
echo "skip_if_no_internet: true" >> "$conf"
|
||||
fi
|
||||
echo "update_db: true" >> "$conf"
|
||||
echo "update_system: true" >> "$conf"
|
||||
}
|
||||
|
||||
write_welcome_conf(){
|
||||
local conf="${etc_config_dir}/welcome.conf"
|
||||
local conf="${modules_dir}/welcome.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf" >> "$conf"
|
||||
echo "showSupportUrl: true" >> "$conf"
|
||||
|
|
@ -248,7 +184,7 @@ write_welcome_conf(){
|
|||
echo " - storage" >> "$conf"
|
||||
echo " - ram" >> "$conf"
|
||||
echo " - root" >> "$conf"
|
||||
if ${needs_internet}; then
|
||||
if ${netinstall}; then
|
||||
echo " - internet" >> "$conf"
|
||||
fi
|
||||
if ${geoip}; then
|
||||
|
|
@ -260,7 +196,7 @@ write_welcome_conf(){
|
|||
}
|
||||
|
||||
write_mhwdcfg_conf(){
|
||||
local conf="${etc_config_dir}/mhwdcfg.conf"
|
||||
local conf="${modules_dir}/mhwdcfg.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "bus:" >> "$conf"
|
||||
|
|
@ -287,7 +223,7 @@ write_mhwdcfg_conf(){
|
|||
}
|
||||
|
||||
write_postcfg_conf(){
|
||||
local conf="${etc_config_dir}/postcfg.conf"
|
||||
local conf="${modules_dir}/postcfg.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "keyrings:" >> "$conf"
|
||||
|
|
@ -315,16 +251,14 @@ get_yaml(){
|
|||
}
|
||||
|
||||
write_netinstall_conf(){
|
||||
local conf="${etc_config_dir}/netinstall.conf"
|
||||
local conf="${modules_dir}/netinstall.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "groupsUrl: ${netgroups}/$(get_yaml)" >> "$conf"
|
||||
echo "label:" >> "$conf"
|
||||
echo " sidebar: \"${netinstall_label}\"" >> "$conf"
|
||||
}
|
||||
|
||||
write_locale_conf(){
|
||||
local conf="${etc_config_dir}/locale.conf"
|
||||
local conf="${modules_dir}/locale.conf"
|
||||
msg2 "Writing %s ..." "${conf##*/}"
|
||||
echo "---" > "$conf"
|
||||
echo "localeGenPath: /etc/locale.gen" >> "$conf"
|
||||
|
|
@ -354,21 +288,21 @@ write_settings_conf(){
|
|||
echo " - locale" >> "$conf" && write_locale_conf
|
||||
echo " - keyboard" >> "$conf"
|
||||
fi
|
||||
echo " - partition" >> "$conf" && write_partition_conf
|
||||
echo " - partition" >> "$conf"
|
||||
if ${oem_used}; then
|
||||
msg2 "Skipping to show users module."
|
||||
else
|
||||
echo " - users" >> "$conf" && write_users_conf
|
||||
fi
|
||||
|
||||
# WIP - OfficeChooser
|
||||
if ${oem_used} || ! ${office_installer}; then
|
||||
msg2 "Skipping enabling PackageChooser module."
|
||||
else
|
||||
msg2 "Enabling PackageChooser module."
|
||||
echo " - packagechooser" >> "$conf"
|
||||
if ${extra}; then
|
||||
if ${oem_used}; then
|
||||
msg2 "Skipping enabling PackageChooser module."
|
||||
else
|
||||
msg2 "Enabling PackageChooser module."
|
||||
echo " - packagechooser" >> "$conf"
|
||||
fi
|
||||
fi
|
||||
|
||||
if ${netinstall}; then
|
||||
echo " - netinstall" >> "$conf" && write_netinstall_conf
|
||||
fi
|
||||
|
|
@ -404,10 +338,7 @@ write_settings_conf(){
|
|||
echo " - initcpio" >> "$conf" && write_initcpio_conf
|
||||
if ${oem_used}; then
|
||||
msg2 "Skipping to set users module."
|
||||
if ${set_oem_user}; then
|
||||
msg2 "Setup OEM user."
|
||||
echo " - oemuser" >> "$conf"
|
||||
fi
|
||||
echo " - oemuser" >> "$conf"
|
||||
else
|
||||
echo " - users" >> "$conf"
|
||||
fi
|
||||
|
|
@ -439,22 +370,12 @@ write_settings_conf(){
|
|||
fi
|
||||
echo '' >> "$conf"
|
||||
echo "dont-chroot: false" >> "$conf"
|
||||
if ${oem_used}; then
|
||||
echo "oem-setup: true" >> "$conf"
|
||||
echo "disable-cancel: true" >> "$conf"
|
||||
else
|
||||
echo "oem-setup: false" >> "$conf"
|
||||
echo "disable-cancel: false" >> "$conf"
|
||||
fi
|
||||
echo "disable-cancel-during-exec: true" >> "$conf"
|
||||
echo "quit-at-end: false" >> "$conf"
|
||||
}
|
||||
|
||||
configure_calamares(){
|
||||
info "Configuring [Calamares]"
|
||||
etc_config_dir=$1/etc/calamares/modules
|
||||
modules_dir=$1/usr/share/calamares/modules
|
||||
prepare_dir "${etc_config_dir}"
|
||||
modules_dir=$1/etc/calamares/modules
|
||||
prepare_dir "${modules_dir}"
|
||||
write_settings_conf "$1"
|
||||
info "Done configuring [Calamares]"
|
||||
}
|
||||
|
|
|
|||
79
lib/util.sh
79
lib/util.sh
|
|
@ -196,10 +196,8 @@ get_branch(){
|
|||
# $1: chroot
|
||||
# $2: branch
|
||||
set_branch(){
|
||||
if [[ $1 =~ "rootfs" ]]; then
|
||||
info "Setting mirrorlist branch: %s" "$2"
|
||||
sed -e "s|/stable|/$2|g" -i "$1/etc/pacman.d/mirrorlist"
|
||||
fi
|
||||
info "Setting mirrorlist branch: %s" "$2"
|
||||
sed -e "s|/stable|/$2|g" -i "$1/etc/pacman.d/mirrorlist"
|
||||
}
|
||||
|
||||
init_common(){
|
||||
|
|
@ -213,7 +211,7 @@ init_common(){
|
|||
|
||||
[[ -z ${log_dir} ]] && log_dir='/var/log/manjaro-tools'
|
||||
|
||||
[[ -z ${build_mirror} ]] && build_mirror='https://mirror.easyname.at/manjaro'
|
||||
[[ -z ${build_mirror} ]] && build_mirror='https://manjaro.moson.eu'
|
||||
|
||||
[[ -z ${tmp_dir} ]] && tmp_dir='/tmp/manjaro-tools'
|
||||
}
|
||||
|
|
@ -341,7 +339,7 @@ init_calamares(){
|
|||
|
||||
[[ -z ${windowexp} ]] && windowexp=noexpand
|
||||
|
||||
[[ -z ${windowsize} ]] && windowsize="800px,560px"
|
||||
[[ -z ${windowsize} ]] && windowsize="800px,520px"
|
||||
|
||||
[[ -z ${windowplacement} ]] && windowplacement="center"
|
||||
|
||||
|
|
@ -409,7 +407,6 @@ load_profile_config(){
|
|||
[[ -z ${snap_channel} ]] && snap_channel="stable"
|
||||
|
||||
[[ -z ${multilib} ]] && multilib="true"
|
||||
[[ ${no_multilib} == 'true' ]] && multilib="false"
|
||||
|
||||
[[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"
|
||||
|
||||
|
|
@ -421,8 +418,6 @@ load_profile_config(){
|
|||
|
||||
[[ -z ${password} ]] && password="manjaro"
|
||||
|
||||
[[ -z ${user_shell} ]] && user_shell='/bin/bash'
|
||||
|
||||
[[ -z ${login_shell} ]] && login_shell='/bin/bash'
|
||||
|
||||
if [[ -z ${addgroups} ]]; then
|
||||
|
|
@ -442,19 +437,16 @@ load_profile_config(){
|
|||
if [[ ${displaymanager} != "none" ]]; then
|
||||
enable_systemd+=("${displaymanager}")
|
||||
fi
|
||||
|
||||
[[ -z ${needs_internet} ]] && needs_internet='false'
|
||||
|
||||
[[ -z ${netinstall} ]] && netinstall='false'
|
||||
[[ -z ${netinstall_label} ]] && netinstall_label='Package selection'
|
||||
|
||||
[[ -z ${mhwd_used} ]] && mhwd_used='true'
|
||||
|
||||
[[ -z ${oem_used} ]] && oem_used='false'
|
||||
[[ -z ${set_oem_user} ]] && set_oem_user='true'
|
||||
|
||||
[[ -z ${chrootcfg} ]] && chrootcfg='false'
|
||||
|
||||
netgroups="https://gitlab.manjaro.org/applications/calamares-netgroups/-/raw/master/"
|
||||
netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master"
|
||||
|
||||
[[ -z ${geoip} ]] && geoip='true'
|
||||
|
||||
|
|
@ -466,8 +458,6 @@ load_profile_config(){
|
|||
basic='true'
|
||||
[[ ${extra} == 'true' ]] && basic='false'
|
||||
|
||||
[[ -z ${office_installer} ]] && office_installer="false"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
|
|
@ -506,18 +496,14 @@ reset_profile(){
|
|||
unset enable_systemd
|
||||
unset disable_systemd
|
||||
unset enable_systemd_live
|
||||
unset disable_systemd_live
|
||||
unset packages_desktop
|
||||
unset packages_mhwd
|
||||
unset user_shell
|
||||
unset login_shell
|
||||
unset netinstall
|
||||
unset chrootcfg
|
||||
unset geoip
|
||||
unset extra
|
||||
unset full_iso
|
||||
unset office_installer
|
||||
unset no_multilib
|
||||
}
|
||||
|
||||
check_profile(){
|
||||
|
|
@ -620,7 +606,7 @@ load_pkgs(){
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# We can reuse this code
|
||||
local _edition _edition_rm
|
||||
case "${edition}" in
|
||||
|
|
@ -634,13 +620,6 @@ load_pkgs(){
|
|||
;;
|
||||
esac
|
||||
|
||||
local _office _office_rm
|
||||
if ${office_installer}; then
|
||||
_office="s|>office||g"
|
||||
else
|
||||
_office_rm="s|>office.*||g"
|
||||
fi
|
||||
|
||||
local _blacklist="s|>blacklist.*||g" \
|
||||
_kernel="s|KERNEL|$kernel|g" \
|
||||
_used_kernel=${kernel:5:2} \
|
||||
|
|
@ -668,8 +647,6 @@ load_pkgs(){
|
|||
| sed "$_basic_rm" \
|
||||
| sed "$_extra" \
|
||||
| sed "$_extra_rm" \
|
||||
| sed "$_office" \
|
||||
| sed "$_office_rm" \
|
||||
| sed "$_clean")
|
||||
|
||||
if [[ $1 == "${packages_mhwd}" ]]; then
|
||||
|
|
@ -786,7 +763,7 @@ is_valid_arch_iso(){
|
|||
|
||||
is_valid_branch(){
|
||||
case $1 in
|
||||
'stable'|'stable-staging'|'testing'|'unstable') return 0 ;;
|
||||
'stable'|'testing'|'unstable') return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
|
@ -833,25 +810,25 @@ create_chksums() {
|
|||
sha256sum $1 > $1.sha256
|
||||
}
|
||||
|
||||
init_profiles() {
|
||||
_workdir='/usr/share/manjaro-tools'
|
||||
if [[ -d ${_workdir}/iso-profiles ]]; then
|
||||
rm -Rf ${_workdir}/iso-profiles
|
||||
fi
|
||||
git clone -q --depth 1 -b ${branch} https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git ${_workdir}/iso-profiles/
|
||||
|
||||
#Check if git clone is done
|
||||
if [[ -d ${_workdir}/iso-profiles/manjaro ]] && [[ -d ${_workdir}/iso-profiles/community ]]; then
|
||||
|
||||
for i in ${_workdir}/iso-profiles/.gitignore ${_workdir}/iso-profiles/README.md; do
|
||||
rm -f $i
|
||||
done
|
||||
|
||||
for i in ${_workdir}/iso-profiles/.git ${_workdir}/iso-profiles/sonar; do
|
||||
rm -Rf $i
|
||||
done
|
||||
else msg2 "Impossible to initialize iso-profiles, please check internet connection or browse at 'https://gitlab.manjaro.org/profiles-and-settings/iso-profiles'"
|
||||
exit 1
|
||||
fi
|
||||
init_profiles() {
|
||||
_workdir='/usr/share/manjaro-tools'
|
||||
if [[ -d ${_workdir}/iso-profiles ]]; then
|
||||
rm -Rf ${_workdir}/iso-profiles ]]
|
||||
fi
|
||||
git clone -q --depth 1 -b ${branch} https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git ${_workdir}/iso-profiles/
|
||||
|
||||
#Check if git clone is done
|
||||
if [[ -d ${_workdir}/iso-profiles/manjaro ]] && [[ -d ${_workdir}/iso-profiles/community ]]; then
|
||||
|
||||
for i in ${_workdir}/iso-profiles/.gitignore ${_workdir}/iso-profiles/README.md; do
|
||||
rm -f $i
|
||||
done
|
||||
|
||||
for i in ${_workdir}/iso-profiles/.git ${_workdir}/iso-profiles/sonar; do
|
||||
rm -Rf $i
|
||||
done
|
||||
else msg2 "Impossible to initialize iso-profiles, please check internet connection or browse at 'https://gitlab.manjaro.org/profiles-and-settings/iso-profiles'"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue