forked from mirrored-repos/manjaro-tools
Merge remote-tracking branch 'upstream/stable-0.15.x' into stable-0.15.x
This commit is contained in:
Ste74
commit
c411f5bf41
9 changed files with 25 additions and 13 deletions
2
Makefile
2
Makefile
|
|
@ -1,4 +1,4 @@
|
|||
Version=0.15.5
|
||||
Version=0.15.8
|
||||
|
||||
PREFIX = /usr/local
|
||||
SYSCONFDIR = /etc
|
||||
|
|
|
|||
|
|
@ -71,8 +71,6 @@ load_user_info
|
|||
load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
load_vars "$USER_HOME/.makepkg.conf" || load_vars /etc/makepkg.conf
|
||||
|
||||
install_pkgs=()
|
||||
|
||||
clean_first=false
|
||||
wipe_clean=false
|
||||
namcap=false
|
||||
|
|
@ -87,7 +85,7 @@ usage() {
|
|||
echo " -b <branch> Branch [default: ${target_branch}]"
|
||||
echo ' -c Recreate chroot'
|
||||
echo ' -h This help'
|
||||
echo ' -i <pkgs> Install packages into the working copy of the chroot'
|
||||
echo ' -i <pkg> Install a package into the working copy of the chroot'
|
||||
echo ' -n Install and run namcap check'
|
||||
echo " -p <pkg> Build list or pkg [default: ${build_list_pkg}]"
|
||||
echo ' -q Query settings and pretend build'
|
||||
|
|
@ -109,7 +107,7 @@ while getopts "${opts}" arg; do
|
|||
a) target_arch="$OPTARG" ;;
|
||||
b) target_branch="$OPTARG" ;;
|
||||
c) clean_first=true ;;
|
||||
i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
|
||||
i) mkchrootpkg_args+=(-I "$OPTARG") ;;
|
||||
n) namcap=true; mkchrootpkg_args+=(-n) ;;
|
||||
p) build_list_pkg="${OPTARG%/}" ;;
|
||||
q) pretend=true ;;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ display_settings(){
|
|||
msg2 "account: %s" "${account}"
|
||||
msg2 "host: %s" "${host}"
|
||||
msg2 "alt_storage: %s" "${alt_storage}"
|
||||
msg2 "ssh_agentt: %s" "${ssh_agent}"
|
||||
msg2 "ssh_agent: %s" "${ssh_agent}"
|
||||
|
||||
msg "UPLOAD QUEUE:"
|
||||
run show_profile "${build_list_iso}"
|
||||
|
|
|
|||
|
|
@ -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 pcmcia filesystems keyboard keymap"
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -38,11 +38,17 @@
|
|||
# disable_systemd=('pacman-init')
|
||||
|
||||
# unset defaults to given values
|
||||
# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel"
|
||||
# addgroups="lp,network,power,sys, wheel"
|
||||
|
||||
# the same workgroup name if samba is used
|
||||
# smb_workgroup="Manjaro"
|
||||
|
||||
# default system shell is bash
|
||||
# '/etc/defaults/useradd': " "
|
||||
# userShell : "/bin/zsh"
|
||||
# empty value will not be used
|
||||
#user_shell=
|
||||
|
||||
################# live-session #################
|
||||
|
||||
# unset defaults to given value
|
||||
|
|
|
|||
|
|
@ -37,7 +37,9 @@ 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/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
|
||||
|
|
|
|||
|
|
@ -59,11 +59,6 @@ configure_mhwd_drivers(){
|
|||
mkdir -p $drv_path/hybrid-intel-nvidia-bumblebee/
|
||||
echo "" > $drv_path/hybrid-intel-nvidia-bumblebee/MHWDCONFIG
|
||||
fi
|
||||
if [ -z "$(ls $path | grep nvidia-304xx-utils 2> /dev/null)" ]; then
|
||||
msg2 "Disabling Nvidia 304xx driver"
|
||||
mkdir -p $drv_path/nvidia-304xx/
|
||||
echo "" > $drv_path/nvidia-304xx/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/
|
||||
|
|
|
|||
|
|
@ -249,6 +249,11 @@ make_image_root() {
|
|||
|
||||
chroot_create "${path}" "${packages}" || die
|
||||
|
||||
# profide multilib usage to mhwd-script
|
||||
if [[ ! -z ${multilib} ]]; then
|
||||
echo 'MHWD64_IS_LIB32="'${multilib}'"' > "${path}/etc/mhwd-x86_64.conf"
|
||||
fi
|
||||
|
||||
pacman -Qr "${path}" > "${path}/rootfs-pkgs.txt"
|
||||
copy_overlay "${profile_dir}/root-overlay" "${path}"
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,10 @@ write_bootloader_conf(){
|
|||
echo 'grubInstall: "grub-install"' >> "$conf"
|
||||
echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"
|
||||
echo 'grubCfg: "/boot/grub/grub.cfg"' >> "$conf"
|
||||
echo 'grubProbe: "grub-probe"' >> "$conf"
|
||||
echo 'efiBootMgr: "efibootmgr"' >> "$conf"
|
||||
echo '#efiBootloaderId: "dirname"' >> "$conf"
|
||||
echo 'installEFIFallback: true' >> "$conf"
|
||||
}
|
||||
|
||||
write_servicescfg_conf(){
|
||||
|
|
@ -145,6 +148,9 @@ write_users_conf(){
|
|||
echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
|
||||
echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
|
||||
echo "avatarFilePath: ~/.face" >> "$conf" # mostly used file-name for avatar
|
||||
if [[ -n "$user_shell" ]]; then
|
||||
echo "userShell: $user_shell" >> "$conf"
|
||||
fi
|
||||
}
|
||||
|
||||
write_packages_conf(){
|
||||
|
|
|
|||
Loading…
Reference in a new issue